diff --git a/.travis.yml b/.travis.yml index 7a80292f3b..9bbc420d53 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,8 +17,8 @@ cache: env: - TEST_PLATFORM="megaatmega2560" - - TEST_PLATFORM="LPC1768" - TEST_PLATFORM="DUE" + - TEST_PLATFORM="LPC1768" - TEST_PLATFORM="STM32F1" - TEST_PLATFORM="teensy35" @@ -49,4 +49,4 @@ before_script: - cat ${TRAVIS_BUILD_DIR}/Marlin/src/inc/_Version.h # script: - - start_tests ${TRAVIS_BUILD_DIR} ${TEST_PLATFORM} + - run_tests ${TRAVIS_BUILD_DIR} ${TEST_PLATFORM} diff --git a/buildroot/share/tests/DUE_tests b/buildroot/share/tests/DUE_tests index ead7a5da49..a15ab84f26 100755 --- a/buildroot/share/tests/DUE_tests +++ b/buildroot/share/tests/DUE_tests @@ -1,4 +1,7 @@ #!/usr/bin/env bash +# +# Build tests for DUE (Atmel SAM3X8E ARM Cortex-M3) +# # exit on first failure set -e diff --git a/buildroot/share/tests/LPC1768_tests b/buildroot/share/tests/LPC1768_tests index ea3f1e9d42..237d9d4d98 100755 --- a/buildroot/share/tests/LPC1768_tests +++ b/buildroot/share/tests/LPC1768_tests @@ -1,4 +1,7 @@ #!/usr/bin/env bash +# +# Build tests for LPC1768 (NXP ARM Cortex-M3) +# # exit on first failure set -e diff --git a/buildroot/share/tests/STM32F1_tests b/buildroot/share/tests/STM32F1_tests index 5a769ad437..3a672445eb 100755 --- a/buildroot/share/tests/STM32F1_tests +++ b/buildroot/share/tests/STM32F1_tests @@ -1,4 +1,7 @@ #!/usr/bin/env bash +# +# Build tests for STM32F103RE +# # exit on first failure set -e diff --git a/buildroot/share/tests/megaatmega2560_tests b/buildroot/share/tests/megaatmega2560_tests index 5c967c1713..2add68af5f 100755 --- a/buildroot/share/tests/megaatmega2560_tests +++ b/buildroot/share/tests/megaatmega2560_tests @@ -1,4 +1,7 @@ #!/usr/bin/env bash +# +# Build tests for AVR +# # exit on first failure set -e @@ -7,11 +10,13 @@ set -e # Backup pins_RAMPS.h # cp Marlin/src/pins/pins_RAMPS.h Marlin/src/pins/pins_RAMPS.h.backup + # # Build with the default configurations # restore_configs exec_test $1 $2 "Default Configuration" + # # Test 2 extruders (one MAX6675) and heated bed on basic RAMPS 1.4 # Test a "Fix Mounted" Probe with Safe Homing, some arc options, @@ -23,15 +28,18 @@ opt_set TEMP_SENSOR_0 -2 opt_set TEMP_SENSOR_1 1 opt_set TEMP_SENSOR_BED 1 opt_set POWER_SUPPLY 1 +opt_set GRID_MAX_POINTS_X 16 opt_enable PIDTEMPBED FIX_MOUNTED_PROBE Z_SAFE_HOMING \ REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT EEPROM_SETTINGS PINS_DEBUGGING \ BLINKM PCA9632 RGB_LED NEOPIXEL_LED AUTO_POWER_CONTROL NOZZLE_PARK_FEATURE FILAMENT_RUNOUT_SENSOR \ - AUTO_BED_LEVELING_LINEAR Z_MIN_PROBE_REPEATABILITY_TEST DEBUG_LEVELING_FEATURE SKEW_CORRECTION SKEW_CORRECTION_FOR_Z SKEW_CORRECTION_GCODE -opt_enable_adv ARC_P_CIRCLES ADVANCED_PAUSE_FEATURE CNC_WORKSPACE_PLANES CNC_COORDINATE_SYSTEMS POWER_LOSS_RECOVERY POWER_LOSS_PIN POWER_LOSS_STATE \ + AUTO_BED_LEVELING_LINEAR Z_MIN_PROBE_REPEATABILITY_TEST DEBUG_LEVELING_FEATURE \ + SKEW_CORRECTION SKEW_CORRECTION_FOR_Z SKEW_CORRECTION_GCODE +opt_enable_adv ARC_P_CIRCLES ADVANCED_PAUSE_FEATURE CNC_WORKSPACE_PLANES CNC_COORDINATE_SYSTEMS \ + POWER_LOSS_RECOVERY POWER_LOSS_PIN POWER_LOSS_STATE \ FWRETRACT MAX7219_DEBUG LED_CONTROL_MENU CASE_LIGHT_ENABLE CASE_LIGHT_USE_NEOPIXEL CODEPENDENT_XY_HOMING -opt_set GRID_MAX_POINTS_X 16 opt_set_adv FANMUX0_PIN 53 -exec_test $1 $2 "Extruders(2) MAX6675 Fixed Probe etc" +exec_test $1 $2 "RAMPS with 2 extruders, RRDFGSC, Linear ABL, LEDs, and many options" + # # Test a probeless build of AUTO_BED_LEVELING_UBL, with lots of extruders # @@ -47,7 +55,8 @@ opt_enable AUTO_BED_LEVELING_UBL RESTORE_LEVELING_AFTER_G28 DEBUG_LEVELING_FEATU EEPROM_SETTINGS EEPROM_CHITCHAT REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER SDSUPPORT opt_enable_adv USB_FLASH_DRIVE_SUPPORT SDCARD_SORT_ALPHA STATUS_MESSAGE_SCROLLING SCROLL_LONG_FILENAMES LIGHTWEIGHT_UI \ CUSTOM_USER_MENUS I2C_POSITION_ENCODERS BABYSTEPPING BABYSTEP_XY LIN_ADVANCE NANODLP_Z_SYNC QUICK_HOME JUNCTION_DEVIATION -exec_test $1 $2 "Probeless build of AUTO_BED_LEVELING_UBL, with lots of extruders" +exec_test $1 $2 "Azteeg X3 with 5 extruders, RRDFGSC, probeless UBL, Linear Advance, and more" + # # Add a Sled Z Probe, use UBL Cartesian moves, use Japanese language # @@ -55,7 +64,8 @@ opt_enable Z_PROBE_SLED SKEW_CORRECTION SKEW_CORRECTION_FOR_Z SKEW_CORRECTION_GC opt_set LCD_LANGUAGE jp-kana opt_disable SEGMENT_LEVELED_MOVES opt_enable_adv BABYSTEP_ZPROBE_OFFSET DOUBLECLICK_FOR_Z_BABYSTEPPING BABYSTEP_HOTEND_Z_OFFSET -exec_test $1 $2 "Add a Sled Z Probe, use UBL Cartesian moves, use Japanese language" +exec_test $1 $2 "... Sled Z Probe, Skew, UBL Cartesian moves, Japanese, and Z probe BABYSTEPPING" + # # Test a Servo Probe # ...with AUTO_BED_LEVELING_3POINT, DEBUG_LEVELING_FEATURE, EEPROM_SETTINGS, EEPROM_CHITCHAT, EXTENDED_CAPABILITIES_REPORT, and AUTO_REPORT_TEMPERATURES @@ -65,27 +75,24 @@ opt_enable Z_PROBE_SERVO_NR Z_SERVO_ANGLES DEACTIVATE_SERVOS_AFTER_MOVE \ AUTO_BED_LEVELING_3POINT DEBUG_LEVELING_FEATURE EEPROM_SETTINGS EEPROM_CHITCHAT opt_set NUM_SERVOS 1 opt_enable_adv NO_VOLUMETRICS EXTENDED_CAPABILITIES_REPORT AUTO_REPORT_TEMPERATURES AUTOTEMP G38_PROBE_TARGET -exec_test $1 $2 "Servo Probe with AUTO_BED_LEVELING_3POINT, DEBUG_LEVELING_FEATURE, EEPROM_SETTINGS etc" +exec_test $1 $2 "RAMPS with Servo Probe, 3-Point ABL, DEBUG_LEVELING_FEATURE, EEPROM, G38, and more" + # # Test MESH_BED_LEVELING feature, with LCD # restore_configs opt_enable MESH_BED_LEVELING G26_MESH_EDITING MESH_G28_REST_ORIGIN LCD_BED_LEVELING ULTIMAKERCONTROLLER exec_test $1 $2 "MESH_BED_LEVELING feature, with LCD" + # -# Test MINIRAMBO for PWM_MOTOR_CURRENT -# PROBE_MANUALLY feature, with LCD support, -# ULTIMAKERCONTROLLER, FILAMENT_LCD_DISPLAY, FILAMENT_WIDTH_SENSOR, -# PRINTCOUNTER, NOZZLE_PARK_FEATURE, NOZZLE_CLEAN_FEATURE, PCA9632, -# Z_DUAL_ENDSTOPS, BEZIER_CURVE_SUPPORT, EXPERIMENTAL_I2CBUS, -# ADVANCED_PAUSE_FEATURE, ADVANCED_PAUSE_CONTINUOUS_PURGE, PARK_HEAD_ON_PAUSE, LCD_INFO_MENU, -# EEPROM_SETTINGS, EEPROM_CHITCHAT, M100_FREE_MEMORY_WATCHER, -# INCH_MODE_SUPPORT, TEMPERATURE_UNITS_SUPPORT +# Test MINIRAMBO with PWM_MOTOR_CURRENT and many features # restore_configs opt_set MOTHERBOARD BOARD_MINIRAMBO -opt_enable PROBE_MANUALLY AUTO_BED_LEVELING_BILINEAR G26_MESH_EDITING LCD_BED_LEVELING ULTIMAKERCONTROLLER \ - EEPROM_SETTINGS EEPROM_CHITCHAT M100_FREE_MEMORY_WATCHER M100_FREE_MEMORY_DUMPER M100_FREE_MEMORY_CORRUPTOR INCH_MODE_SUPPORT TEMPERATURE_UNITS_SUPPORT \ +opt_enable PROBE_MANUALLY AUTO_BED_LEVELING_BILINEAR G26_MESH_EDITING LCD_BED_LEVELING \ + EEPROM_SETTINGS EEPROM_CHITCHAT \ + M100_FREE_MEMORY_WATCHER M100_FREE_MEMORY_DUMPER M100_FREE_MEMORY_CORRUPTOR \ + INCH_MODE_SUPPORT TEMPERATURE_UNITS_SUPPORT \ ULTIMAKERCONTROLLER SDSUPPORT \ PRINTCOUNTER NOZZLE_PARK_FEATURE NOZZLE_CLEAN_FEATURE PCA9632 opt_enable_adv BEZIER_CURVE_SUPPORT EXPERIMENTAL_I2CBUS \ @@ -94,6 +101,7 @@ opt_enable_adv BEZIER_CURVE_SUPPORT EXPERIMENTAL_I2CBUS \ opt_set_adv PWM_MOTOR_CURRENT "{ 1300, 1300, 1250 }" opt_set_adv I2C_SLAVE_ADDRESS 63 exec_test $1 $2 "MINIRAMBO for PWM_MOTOR_CURRENT etc" + # # Mixing Extruder with 5 steppers, Cyrillic # @@ -103,6 +111,7 @@ opt_enable MIXING_EXTRUDER CR10_STOCKDISPLAY opt_set MIXING_STEPPERS 5 opt_set LCD_LANGUAGE ru exec_test $1 $2 "Mixing Extruder with 5 steppers, Cyrillic" + # # Test DUAL_X_CARRIAGE # @@ -113,6 +122,7 @@ opt_set TEMP_SENSOR_1 1 opt_enable USE_XMAX_PLUG opt_enable_adv DUAL_X_CARRIAGE exec_test $1 $2 "DUAL_X_CARRIAGE" + # # Test SPEAKER with BOARD_BQ_ZUM_MEGA_3D and BQ_LCD_SMART_CONTROLLER # @@ -121,17 +131,22 @@ exec_test $1 $2 "DUAL_X_CARRIAGE" #opt_set LCD_FEEDBACK_FREQUENCY_DURATION_MS 10 #opt_set LCD_FEEDBACK_FREQUENCY_HZ 100 #opt_enable BQ_LCD_SMART_CONTROLLER SPEAKER + # # Enable COREXY # #restore_configs #opt_enable COREXY #exec_test $1 $2 "Stuff" + # # Test many less common options # restore_configs opt_set MOTHERBOARD BOARD_AZTEEG_X3_PRO +opt_set EXTRUDERS 2 +opt_set TEMP_SENSOR_1 -4 +opt_set SERVO_DELAY "{ 300, 300, 300 }" opt_enable COREYX USE_XMAX_PLUG \ REPRAP_DISCOUNT_SMART_CONTROLLER BABYSTEPPING DAC_MOTOR_CURRENT_DEFAULT \ FILAMENT_LCD_DISPLAY FILAMENT_WIDTH_SENSOR \ @@ -140,16 +155,13 @@ opt_enable COREYX USE_XMAX_PLUG \ opt_set_adv FAN_MIN_PWM 50 opt_set_adv FAN_KICKSTART_TIME 100 opt_set_adv XY_FREQUENCY_LIMIT 15 -opt_enable_adv SHOW_TEMP_ADC_VALUES HOME_Y_BEFORE_X EMERGENCY_PARSER FAN_KICKSTART_TIME \ +opt_enable_adv SHOW_TEMP_ADC_VALUES HOME_Y_BEFORE_X EMERGENCY_PARSER \ ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED ADVANCED_OK \ VOLUMETRIC_DEFAULT_ON NO_WORKSPACE_OFFSETS ACTION_ON_KILL \ EXTRA_FAN_SPEED FWERETRACT Z_DUAL_STEPPER_DRIVERS Z_DUAL_ENDSTOPS \ MENU_ADDAUTOSTART SDCARD_SORT_ALPHA -opt_set EXTRUDERS 2 -opt_set TEMP_SENSOR_1 -4 -opt_set SERVO_DELAY "{ 300, 300, 300 }" exec_test $1 $2 "Many less common options" -# + ######## Other Standard LCD/Panels ############## # # ULTRA_LCD @@ -189,12 +201,6 @@ exec_test $1 $2 "Many less common options" #opt_set_adv SDSORT_CACHE_NAMES true #exec_test $1 $2 "Stuff" # -# Test a full-featured CR-10S config -# -use_example_configs Creality/CR-10S -opt_enable SHOW_CUSTOM_BOOTSCREEN -exec_test $1 $2 "Full-featured CR-10S config" -# # REPRAPWORLD_KEYPAD # # Cant find configuration details to get it to compile @@ -207,7 +213,7 @@ exec_test $1 $2 "Full-featured CR-10S config" #restore_configs #opt_enable RA_CONTROL_PANEL PINS_DEBUGGING #exec_test $1 $2 "Stuff" -# + ######## I2C LCD/PANELS ############## # # !!!ATTENTION!!! @@ -237,6 +243,7 @@ exec_test $1 $2 "Full-featured CR-10S config" #restore_configs #opt_enable LCM1602 #exec_test $1 $2 "Stuff" + # # Language files test with REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER # @@ -247,10 +254,15 @@ exec_test $1 $2 "Full-featured CR-10S config" #restore_configs #opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT #for lang in an bg ca zh_CN zh_TW cz da de el el-gr en es eu fi fr gl hr it jp-kana nl pl pt pt-br ru sk tr uk test; do opt_set LCD_LANGUAGE $lang; echo "compile with language $lang ..."; exec_test $1 $2 "Stuff"; done -# -# + ######## Example Configurations ############## # +# Test a full-featured CR-10S config +# +use_example_configs Creality/CR-10S +opt_enable SHOW_CUSTOM_BOOTSCREEN +exec_test $1 $2 "Full-featured CR-10S config" +# # BQ Hephestos 2 #restore_configs #use_example_configs Hephestos_2 diff --git a/buildroot/share/tests/start_tests b/buildroot/share/tests/run_tests similarity index 94% rename from buildroot/share/tests/start_tests rename to buildroot/share/tests/run_tests index 775fb47f2c..ec21df500e 100755 --- a/buildroot/share/tests/start_tests +++ b/buildroot/share/tests/run_tests @@ -1,4 +1,7 @@ #!/usr/bin/env bash +# +# run_tests +# export PATH="$PATH:$( cd "$(dirname "${BASH_SOURCE[0]}")" ; pwd -P )" export PATH="$PATH:./buildroot/bin" @@ -27,7 +30,7 @@ fi if [[ $2 = "ALL" ]]; then dir_list=("$(dirname "${BASH_SOURCE[0]}")"/*) - declare -a tests=(${dir_list[@]/*start_tests/}) + declare -a tests=(${dir_list[@]/*run_tests/}) for f in "${tests[@]}"; do env_backup testenv=$(basename $f | cut -d"_" -f1) diff --git a/buildroot/share/tests/teensy35_tests b/buildroot/share/tests/teensy35_tests index d087da2c8f..abfdc23f1c 100755 --- a/buildroot/share/tests/teensy35_tests +++ b/buildroot/share/tests/teensy35_tests @@ -1,4 +1,7 @@ #!/usr/bin/env bash +# +# Build tests for Teensy 3.5/3.6 (ARM Cortex-M4) +# # exit on first failure set -e @@ -6,10 +9,8 @@ set -e restore_configs opt_set MOTHERBOARD BOARD_TEENSY35_36 cp Marlin/src/pins/pins_RAMPS.h Marlin/src/pins/pins_RAMPS.h.backup -# -# Test Teensy3.5 with default config -# exec_test $1 $2 "Teensy3.5 with default config" + # # Test as many features together as possible # @@ -26,7 +27,8 @@ opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER SDSUPPORT \ opt_enable_adv ADVANCED_PAUSE_FEATURE LCD_INFO_MENU ARC_SUPPORT BEZIER_CURVE_SUPPORT EXPERIMENTAL_I2CBUS EXTENDED_CAPABILITIES_REPORT AUTO_REPORT_TEMPERATURES SDCARD_SORT_ALPHA PARK_HEAD_ON_PAUSE opt_set_adv I2C_SLAVE_ADDRESS 63 opt_set GRID_MAX_POINTS_X 16 -exec_test $1 $2 "As many features together as possible" +exec_test $1 $2 "Teensy3.5 with many features" + # # Test a Sled Z Probe with Linear leveling # @@ -34,6 +36,7 @@ restore_configs opt_enable EEPROM_SETTINGS \ Z_PROBE_SLED AUTO_BED_LEVELING_LINEAR DEBUG_LEVELING_FEATURE exec_test $1 $2 "Sled Z Probe with Linear leveling" + # # Test a Servo Probe # @@ -48,12 +51,14 @@ exec_test $1 $2 "Sled Z Probe with Linear leveling" # opt_enable AUTO_BED_LEVELING_3POINT DEBUG_LEVELING_FEATURE EEPROM_SETTINGS # opt_enable_adv EXTENDED_CAPABILITIES_REPORT AUTO_REPORT_TEMPERATURES # exec_test $1 $2 "...with AUTO_BED_LEVELING_3POINT, DEBUG_LEVELING_FEATURE, EEPROM_SETTINGS, EEPROM_CHITCHAT, EXTENDED_CAPABILITIES_REPORT, and AUTO_REPORT_TEMPERATURES" + # # Test MESH_BED_LEVELING feature, with LCD # restore_configs opt_enable MESH_BED_LEVELING MESH_G28_REST_ORIGIN MANUAL_BED_LEVELING ULTIMAKERCONTROLLER exec_test $1 $2 "MESH_BED_LEVELING feature, with LCD" + # # Mixing Extruder # @@ -61,6 +66,7 @@ restore_configs opt_enable MIXING_EXTRUDER DIRECT_MIXING_IN_G1 opt_set MIXING_STEPPERS 2 exec_test $1 $2 "Mixing Extruder" + # # Test SWITCHING_EXTRUDER # @@ -75,12 +81,14 @@ exec_test $1 $2 "Mixing Extruder" restore_configs opt_enable COREXY exec_test $1 $2 "COREXY" + # # Enable COREXZ # restore_configs opt_enable COREXZ exec_test $1 $2 "COREXZ" + # # Enable Z_DUAL_STEPPER_DRIVERS, Z_DUAL_ENDSTOPS #