From b35e16b1d87160b3cfc70f14283515dce8e8dc64 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Thu, 3 Oct 2024 13:22:46 -0500
Subject: [PATCH] =?UTF-8?q?=E2=9C=85=20Remove=20extra=20config=20restore?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildroot/tests/ARMED                        | 5 +----
 buildroot/tests/BTT_BTT002                   | 3 ---
 buildroot/tests/BTT_GTR_V1_0                 | 3 ---
 buildroot/tests/BTT_GTR_V1_0_usb_flash_drive | 3 ---
 buildroot/tests/BTT_SKR_PRO                  | 3 ---
 buildroot/tests/BTT_SKR_SE_BX                | 3 ---
 buildroot/tests/FYSETC_F6                    | 3 ---
 buildroot/tests/I3DBEEZ9_V1                  | 3 ---
 buildroot/tests/LERDGEK                      | 3 ---
 buildroot/tests/LERDGEX                      | 3 ---
 buildroot/tests/LPC1768                      | 3 ---
 buildroot/tests/LPC1769                      | 3 ---
 buildroot/tests/NUCLEO_F767ZI                | 3 ---
 buildroot/tests/PANDA_PI_V29                 | 3 ---
 buildroot/tests/REMRAM_V1                    | 3 ---
 buildroot/tests/SAMD21_minitronics20         | 3 ---
 buildroot/tests/SAMD51_grandcentral_m4       | 3 ---
 buildroot/tests/STM32F103RC_btt              | 3 ---
 buildroot/tests/STM32F103RC_btt_USB          | 3 ---
 buildroot/tests/STM32F103RC_btt_USB_maple    | 3 ---
 buildroot/tests/STM32F103RC_btt_maple        | 3 ---
 buildroot/tests/STM32F103RC_fysetc           | 3 ---
 buildroot/tests/STM32F103RC_fysetc_maple     | 3 ---
 buildroot/tests/STM32F103RC_meeb_maple       | 3 ---
 buildroot/tests/STM32F103RE_btt              | 3 ---
 buildroot/tests/STM32F103RE_btt_USB          | 3 ---
 buildroot/tests/STM32F103RE_creality         | 3 ---
 buildroot/tests/STM32F401RC_creality         | 3 ---
 buildroot/tests/STM32G0B1RE_btt              | 3 ---
 buildroot/tests/STM32H743VI_btt              | 3 ---
 buildroot/tests/at90usb1286_cdc              | 3 ---
 buildroot/tests/at90usb1286_dfu              | 3 ---
 buildroot/tests/chitu_f103                   | 3 ---
 buildroot/tests/jgaurora_a5s_a1_maple        | 3 ---
 buildroot/tests/mega1280                     | 3 ---
 buildroot/tests/mega2560                     | 3 ---
 buildroot/tests/melzi_optiboot               | 3 ---
 buildroot/tests/rambo                        | 3 ---
 buildroot/tests/sanguino1284p                | 3 ---
 buildroot/tests/sanguino644p                 | 3 ---
 buildroot/tests/teensy35                     | 3 ---
 buildroot/tests/teensy41                     | 3 ---
 42 files changed, 1 insertion(+), 127 deletions(-)

diff --git a/buildroot/tests/ARMED b/buildroot/tests/ARMED
index 7b9fef1eeb..e47e101d47 100755
--- a/buildroot/tests/ARMED
+++ b/buildroot/tests/ARMED
@@ -7,13 +7,10 @@
 set -e
 
 #
-# Build with the default configurations
+# Build with modified ArmEd configuration
 #
 restore_configs
 use_example_configs ArmEd
 opt_set X_DRIVER_TYPE TMC2130 Y_DRIVER_TYPE TMC2208
 opt_enable LASER_SYNCHRONOUS_M106_M107
 exec_test $1 $2 "ArmEd Example Configuration with mixed TMC Drivers" "$3"
-
-# clean up
-restore_configs
diff --git a/buildroot/tests/BTT_BTT002 b/buildroot/tests/BTT_BTT002
index 5398d30fea..121aace895 100755
--- a/buildroot/tests/BTT_BTT002
+++ b/buildroot/tests/BTT_BTT002
@@ -21,6 +21,3 @@ exec_test $1 $2 "BigTreeTech BTT002 Default Configuration plus TMC steppers" "$3
 #
 use_example_configs Prusa/MK3S-BigTreeTech-BTT002
 exec_test $1 $2 "BigTreeTech BTT002 with Prusa MK3S and related options" "$3"
-
-# clean up
-restore_configs
diff --git a/buildroot/tests/BTT_GTR_V1_0 b/buildroot/tests/BTT_GTR_V1_0
index dcfd2b3eef..c6cb7d5feb 100755
--- a/buildroot/tests/BTT_GTR_V1_0
+++ b/buildroot/tests/BTT_GTR_V1_0
@@ -46,6 +46,3 @@ opt_set MOTHERBOARD BOARD_BTT_GTR_V1_0 SERIAL_PORT -1 \
 opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER SWITCHING_TOOLHEAD TOOL_SENSOR MPCTEMP MPC_EDIT_MENU MPC_AUTOTUNE MPC_AUTOTUNE_MENU
 opt_disable PIDTEMP
 exec_test $1 $2 "BigTreeTech GTR | MPC | Switching Toolhead | Tool Sensors" "$3"
-
-# clean up
-restore_configs
diff --git a/buildroot/tests/BTT_GTR_V1_0_usb_flash_drive b/buildroot/tests/BTT_GTR_V1_0_usb_flash_drive
index 78aec13295..da45592e58 100755
--- a/buildroot/tests/BTT_GTR_V1_0_usb_flash_drive
+++ b/buildroot/tests/BTT_GTR_V1_0_usb_flash_drive
@@ -19,6 +19,3 @@ opt_set E0_AUTO_FAN_PIN PC10 E1_AUTO_FAN_PIN PC11 E2_AUTO_FAN_PIN PC12 NEOPIXEL_
         FIL_RUNOUT4_STATE HIGH FIL_RUNOUT8_STATE HIGH
 opt_enable FIL_RUNOUT4_PULLUP FIL_RUNOUT8_PULLUP
 exec_test $1 $2 "GTT GTR | OTG USB Flash Drive | 8 Extruders | Auto-Fan | Mixed TMC Drivers | Runout Sensors (distinct)" "$3"
-
-# clean up
-restore_configs
diff --git a/buildroot/tests/BTT_SKR_PRO b/buildroot/tests/BTT_SKR_PRO
index 3ffc9857a8..f20116d9a1 100755
--- a/buildroot/tests/BTT_SKR_PRO
+++ b/buildroot/tests/BTT_SKR_PRO
@@ -28,6 +28,3 @@ opt_set MOTHERBOARD BOARD_BTT_SKR_PRO_V1_1 SERIAL_PORT -1 \
         TEMP_SENSOR_COOLER 1000 TEMP_COOLER_PIN PD13
 opt_enable LASER_FEATURE LASER_SAFETY_TIMEOUT_MS REPRAP_DISCOUNT_SMART_CONTROLLER
 exec_test $1 $2 "BigTreeTech SKR Pro | HD44780 | Laser (Percent) | Cooling | LCD" "$3"
-
-# clean up
-restore_configs
diff --git a/buildroot/tests/BTT_SKR_SE_BX b/buildroot/tests/BTT_SKR_SE_BX
index 199cff14b9..8ba87da069 100755
--- a/buildroot/tests/BTT_SKR_SE_BX
+++ b/buildroot/tests/BTT_SKR_SE_BX
@@ -11,6 +11,3 @@ set -e
 #
 use_example_configs BIQU/BX
 exec_test $1 $2 "BIQU/BX" "$3"
-
-# clean up
-restore_configs
diff --git a/buildroot/tests/FYSETC_F6 b/buildroot/tests/FYSETC_F6
index 713408b550..6dd7bb60fa 100755
--- a/buildroot/tests/FYSETC_F6
+++ b/buildroot/tests/FYSETC_F6
@@ -73,6 +73,3 @@ opt_enable FIX_MOUNTED_PROBE AUTO_BED_LEVELING_BILINEAR PAUSE_BEFORE_DEPLOY_STOW
            FYSETC_242_OLED_12864 EEPROM_SETTINGS EEPROM_CHITCHAT M114_DETAIL Z_SAFE_HOMING \
            STEALTHCHOP_XY STEALTHCHOP_Z STEALTHCHOP_E HYBRID_THRESHOLD SENSORLESS_HOMING X_STALL_SENSITIVITY Y_STALL_SENSITIVITY EDGE_STEPPING
 exec_test $1 $2 "SCARA | Mixed TMC | EEPROM" "$3"
-
-# clean up
-restore_configs
diff --git a/buildroot/tests/I3DBEEZ9_V1 b/buildroot/tests/I3DBEEZ9_V1
index 7c11d2e6c8..8100932827 100755
--- a/buildroot/tests/I3DBEEZ9_V1
+++ b/buildroot/tests/I3DBEEZ9_V1
@@ -28,6 +28,3 @@ opt_set MOTHERBOARD BOARD_I3DBEEZ9_V1 SERIAL_PORT -1 \
         TEMP_SENSOR_COOLER 1000 TEMP_COOLER_PIN PD13
 opt_enable LASER_FEATURE LASER_SAFETY_TIMEOUT_MS REPRAP_DISCOUNT_SMART_CONTROLLER
 exec_test $1 $2 "I3DBEE Z9 Board | HD44780 | Laser (Percent) | Cooling | LCD" "$3"
-
-# clean up
-restore_configs
diff --git a/buildroot/tests/LERDGEK b/buildroot/tests/LERDGEK
index b0806e9085..347bdbf522 100755
--- a/buildroot/tests/LERDGEK
+++ b/buildroot/tests/LERDGEK
@@ -13,6 +13,3 @@ restore_configs
 opt_set MOTHERBOARD BOARD_LERDGE_K SERIAL_PORT 1
 opt_enable TFT_GENERIC TFT_INTERFACE_FSMC TFT_COLOR_UI COMPACT_MARLIN_BOOT_LOGO
 exec_test $1 $2 "LERDGE K with Generic FSMC TFT with ColorUI" "$3"
-
-# clean up
-restore_configs
diff --git a/buildroot/tests/LERDGEX b/buildroot/tests/LERDGEX
index cf7dfebfea..f7851db8f4 100755
--- a/buildroot/tests/LERDGEX
+++ b/buildroot/tests/LERDGEX
@@ -12,6 +12,3 @@ set -e
 restore_configs
 opt_set MOTHERBOARD BOARD_LERDGE_X SERIAL_PORT 1
 exec_test $1 $2 "LERDGE X with Default Configuration" "$3"
-
-# clean up
-restore_configs
diff --git a/buildroot/tests/LPC1768 b/buildroot/tests/LPC1768
index f932625fa7..a7240eb11a 100755
--- a/buildroot/tests/LPC1768
+++ b/buildroot/tests/LPC1768
@@ -93,6 +93,3 @@ opt_enable PIDTEMPBED S_CURVE_ACCELERATION \
 opt_disable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN FILAMENT_LOAD_UNLOAD_GCODES \
         PARK_HEAD_ON_PAUSE
 exec_test $1 $2 "BigTreeTech SKR 1.4 | MMU2" "$3"
-
-# clean up
-restore_configs
diff --git a/buildroot/tests/LPC1769 b/buildroot/tests/LPC1769
index 6cdeb43582..1c3336d4fc 100755
--- a/buildroot/tests/LPC1769
+++ b/buildroot/tests/LPC1769
@@ -98,6 +98,3 @@ opt_enable PIDTEMPBED S_CURVE_ACCELERATION \
         MMU_SPOOL_JOIN_CONSUMES_ALL_FILAMENT MMU_MENUS MMU2_DEBUG
 opt_disable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN FILAMENT_LOAD_UNLOAD_GCODES PARK_HEAD_ON_PAUSE
 exec_test $1 $2 "BigTreeTech SKR 1.4 Turbo | MMU3" "$3"
-
-# clean up
-restore_configs
diff --git a/buildroot/tests/NUCLEO_F767ZI b/buildroot/tests/NUCLEO_F767ZI
index a331618a09..9f4e332591 100755
--- a/buildroot/tests/NUCLEO_F767ZI
+++ b/buildroot/tests/NUCLEO_F767ZI
@@ -13,6 +13,3 @@ restore_configs
 opt_set MOTHERBOARD BOARD_NUCLEO_F767ZI SERIAL_PORT -1 X_DRIVER_TYPE TMC2209 Y_DRIVER_TYPE TMC2208
 opt_enable BLTOUCH Z_SAFE_HOMING REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER SPEAKER STARTUP_TUNE SOFTWARE_DRIVER_ENABLE
 exec_test $1 $2 "Mixed timer usage" "$3"
-
-# clean up
-restore_configs
diff --git a/buildroot/tests/PANDA_PI_V29 b/buildroot/tests/PANDA_PI_V29
index a176e571ba..14f86715ea 100755
--- a/buildroot/tests/PANDA_PI_V29
+++ b/buildroot/tests/PANDA_PI_V29
@@ -14,6 +14,3 @@ opt_set MOTHERBOARD BOARD_PANDA_PI_V29 SERIAL_PORT -1 \
         Z_CLEARANCE_DEPLOY_PROBE 0 Z_CLEARANCE_BETWEEN_PROBES 1 Z_CLEARANCE_MULTI_PROBE 1
 opt_enable BD_SENSOR AUTO_BED_LEVELING_BILINEAR Z_SAFE_HOMING BABYSTEPPING
 exec_test $1 $2 "Panda Pi V29 | BD Sensor | ABL-B" "$3"
-
-# clean up
-restore_configs
diff --git a/buildroot/tests/REMRAM_V1 b/buildroot/tests/REMRAM_V1
index f5944ff5af..4ea63fa0a6 100755
--- a/buildroot/tests/REMRAM_V1
+++ b/buildroot/tests/REMRAM_V1
@@ -13,6 +13,3 @@ restore_configs
 opt_set MOTHERBOARD BOARD_REMRAM_V1
 opt_set SERIAL_PORT 1
 exec_test $1 $2 "Default Configuration" "$3"
-
-# clean up
-restore_configs
diff --git a/buildroot/tests/SAMD21_minitronics20 b/buildroot/tests/SAMD21_minitronics20
index ae9fa55ea4..fb23e90be7 100755
--- a/buildroot/tests/SAMD21_minitronics20
+++ b/buildroot/tests/SAMD21_minitronics20
@@ -27,6 +27,3 @@ opt_enable ENDSTOP_INTERRUPTS_FEATURE BLTOUCH Z_MIN_PROBE_REPEATABILITY_TEST \
            MOVE_Z_WHEN_IDLE BABYSTEP_ZPROBE_OFFSET BABYSTEP_GFX_OVERLAY \
            LIN_ADVANCE ADVANCED_PAUSE_FEATURE PARK_HEAD_ON_PAUSE MONITOR_DRIVER_STATUS
 exec_test $1 $2 "Minitronics 2.0 with assorted features" "$3"
-
-# clean up
-restore_configs
diff --git a/buildroot/tests/SAMD51_grandcentral_m4 b/buildroot/tests/SAMD51_grandcentral_m4
index 312bd627ba..da2cdd30b0 100755
--- a/buildroot/tests/SAMD51_grandcentral_m4
+++ b/buildroot/tests/SAMD51_grandcentral_m4
@@ -29,6 +29,3 @@ opt_enable ENDSTOP_INTERRUPTS_FEATURE S_CURVE_ACCELERATION BLTOUCH Z_MIN_PROBE_R
            SENSORLESS_HOMING X_STALL_SENSITIVITY Y_STALL_SENSITIVITY Z_STALL_SENSITIVITY Z2_STALL_SENSITIVITY \
            EDGE_STEPPING TMC_DEBUG
 exec_test $1 $2 "Grand Central M4 with assorted features" "$3"
-
-# clean up
-restore_configs
diff --git a/buildroot/tests/STM32F103RC_btt b/buildroot/tests/STM32F103RC_btt
index b9fff2b6c5..62ef7d96e5 100755
--- a/buildroot/tests/STM32F103RC_btt
+++ b/buildroot/tests/STM32F103RC_btt
@@ -14,6 +14,3 @@ opt_set MOTHERBOARD BOARD_BTT_SKR_MINI_E3_V1_0 SERIAL_PORT 1 SERIAL_PORT_2 -1 \
         X_DRIVER_TYPE TMC2209 Y_DRIVER_TYPE TMC2209 Z_DRIVER_TYPE TMC2209 E0_DRIVER_TYPE TMC2209
 opt_enable CR10_STOCKDISPLAY PINS_DEBUGGING Z_IDLE_HEIGHT FT_MOTION FT_MOTION_MENU ADAPTIVE_STEP_SMOOTHING NONLINEAR_EXTRUSION
 exec_test $1 $2 "BigTreeTech SKR Mini E3 1.0 - TMC2209 HW Serial, FT_MOTION" "$3"
-
-# clean up
-restore_configs
diff --git a/buildroot/tests/STM32F103RC_btt_USB b/buildroot/tests/STM32F103RC_btt_USB
index c8ee4f7814..922b8f8c11 100755
--- a/buildroot/tests/STM32F103RC_btt_USB
+++ b/buildroot/tests/STM32F103RC_btt_USB
@@ -12,6 +12,3 @@ set -e
 restore_configs
 opt_set MOTHERBOARD BOARD_BTT_SKR_MINI_V1_1 SERIAL_PORT 1 SERIAL_PORT_2 -1 TEMP_SENSOR_SOC 100
 exec_test $1 $2 "BigTreeTech SKR Mini v1.1 - SOC Temperature" "$3"
-
-# clean up
-restore_configs
diff --git a/buildroot/tests/STM32F103RC_btt_USB_maple b/buildroot/tests/STM32F103RC_btt_USB_maple
index eeb460911a..e9ce166e67 100755
--- a/buildroot/tests/STM32F103RC_btt_USB_maple
+++ b/buildroot/tests/STM32F103RC_btt_USB_maple
@@ -12,6 +12,3 @@ set -e
 restore_configs
 opt_set MOTHERBOARD BOARD_BTT_SKR_MINI_V1_1 SERIAL_PORT 1 SERIAL_PORT_2 -1 BAUDRATE_2 115200
 exec_test $1 $2 "BigTreeTech SKR Mini v1.1 - Basic Configuration" "$3"
-
-# clean up
-restore_configs
diff --git a/buildroot/tests/STM32F103RC_btt_maple b/buildroot/tests/STM32F103RC_btt_maple
index 90e33ab529..1ede07faef 100755
--- a/buildroot/tests/STM32F103RC_btt_maple
+++ b/buildroot/tests/STM32F103RC_btt_maple
@@ -14,6 +14,3 @@ opt_set MOTHERBOARD BOARD_BTT_SKR_MINI_E3_V1_0 SERIAL_PORT 1 SERIAL_PORT_2 -1 \
         X_DRIVER_TYPE TMC2209 Y_DRIVER_TYPE TMC2209 Z_DRIVER_TYPE TMC2209 E0_DRIVER_TYPE TMC2209
 opt_enable PINS_DEBUGGING Z_IDLE_HEIGHT
 exec_test $1 $2 "BigTreeTech SKR Mini E3 1.0 - Basic Config with TMC2209 HW Serial" "$3"
-
-# clean up
-restore_configs
diff --git a/buildroot/tests/STM32F103RC_fysetc b/buildroot/tests/STM32F103RC_fysetc
index 93b0fedf3d..6a19e01e0d 100755
--- a/buildroot/tests/STM32F103RC_fysetc
+++ b/buildroot/tests/STM32F103RC_fysetc
@@ -11,6 +11,3 @@ set -e
 #
 use_example_configs "Creality/Ender-3/FYSETC Cheetah 1.2/BLTouch"
 exec_test $1 $2 "Ender-3 with Cheetah 1.2 | BLTouch" "$3"
-
-# clean up
-restore_configs
diff --git a/buildroot/tests/STM32F103RC_fysetc_maple b/buildroot/tests/STM32F103RC_fysetc_maple
index 09dba7ef61..f401d1c00c 100755
--- a/buildroot/tests/STM32F103RC_fysetc_maple
+++ b/buildroot/tests/STM32F103RC_fysetc_maple
@@ -11,6 +11,3 @@ set -e
 #
 use_example_configs "Creality/Ender-3/FYSETC Cheetah 1.2/base"
 exec_test $1 $2 "Maple build of Cheetah 1.2 Configuration" "$3"
-
-# clean up
-restore_configs
diff --git a/buildroot/tests/STM32F103RC_meeb_maple b/buildroot/tests/STM32F103RC_meeb_maple
index 3a191b4e7e..f2a05abee1 100755
--- a/buildroot/tests/STM32F103RC_meeb_maple
+++ b/buildroot/tests/STM32F103RC_meeb_maple
@@ -13,6 +13,3 @@ restore_configs
 opt_set MOTHERBOARD BOARD_CCROBOT_MEEB_3DP SERIAL_PORT 1 SERIAL_PORT_2 -1 \
         X_DRIVER_TYPE TMC2208 Y_DRIVER_TYPE TMC2208 Z_DRIVER_TYPE TMC2208 E0_DRIVER_TYPE TMC2208
 exec_test $1 $2 "MEEB_3DP - Basic Config with TMC2208 SW Serial" "$3"
-
-# clean up
-restore_configs
diff --git a/buildroot/tests/STM32F103RE_btt b/buildroot/tests/STM32F103RE_btt
index 197ca77598..fdf1580e98 100755
--- a/buildroot/tests/STM32F103RE_btt
+++ b/buildroot/tests/STM32F103RE_btt
@@ -15,6 +15,3 @@ opt_set MOTHERBOARD BOARD_BTT_SKR_E3_DIP \
         X_DRIVER_TYPE TMC2209 Y_DRIVER_TYPE TMC2130
 opt_enable SERIAL_DMA
 exec_test $1 $2 "BTT SKR E3 DIP 1.0 | Mixed TMC Drivers" "$3"
-
-# clean up
-restore_configs
diff --git a/buildroot/tests/STM32F103RE_btt_USB b/buildroot/tests/STM32F103RE_btt_USB
index 0bf5f616e4..ddf1903c9b 100755
--- a/buildroot/tests/STM32F103RE_btt_USB
+++ b/buildroot/tests/STM32F103RE_btt_USB
@@ -22,6 +22,3 @@ opt_enable CR10_STOCKDISPLAY SDSUPPORT EMERGENCY_PARSER FAN_SOFT_PWM \
            PROBING_HEATERS_OFF PREHEAT_BEFORE_PROBING
 opt_disable NOZZLE_TO_PROBE_OFFSET
 exec_test $1 $2 "BigTreeTech SKR CR6 PROBE_ACTIVATION_SWITCH, Probe Tare" "$3"
-
-# clean up
-restore_configs
diff --git a/buildroot/tests/STM32F103RE_creality b/buildroot/tests/STM32F103RE_creality
index 44d818b624..d08b82f7bd 100755
--- a/buildroot/tests/STM32F103RE_creality
+++ b/buildroot/tests/STM32F103RE_creality
@@ -47,6 +47,3 @@ opt_enable NOZZLE_PARK_FEATURE ADVANCED_PAUSE_FEATURE LCD_BED_TRAMMING CLASSIC_J
 opt_add NO_CREALITY_422_DRIVER_WARNING
 opt_add NO_AUTO_ASSIGN_WARNING
 exec_test $1 $2 "Creality V4.2.2 with IA_CREALITY" "$3"
-
-# clean up
-restore_configs
diff --git a/buildroot/tests/STM32F401RC_creality b/buildroot/tests/STM32F401RC_creality
index 61b8d2ef9c..185599ecb3 100755
--- a/buildroot/tests/STM32F401RC_creality
+++ b/buildroot/tests/STM32F401RC_creality
@@ -11,6 +11,3 @@ opt_enable AUTO_BED_LEVELING_BILINEAR Z_SAFE_HOMING
 opt_set MOTHERBOARD BOARD_CREALITY_V24S1_301F4
 opt_add SDCARD_EEPROM_EMULATION
 exec_test $1 $2 "Ender-3 v2 with MarlinUI" "$3"
-
-# clean up
-restore_configs
diff --git a/buildroot/tests/STM32G0B1RE_btt b/buildroot/tests/STM32G0B1RE_btt
index 35ccf0f936..04f740d2f9 100755
--- a/buildroot/tests/STM32G0B1RE_btt
+++ b/buildroot/tests/STM32G0B1RE_btt
@@ -11,6 +11,3 @@ set -e
 #
 use_example_configs "Creality/Ender-3/BigTreeTech SKR Mini E3 3.0"
 exec_test $1 $2 "Creality/Ender-3/BigTreeTech SKR Mini E3 3.0" "$3"
-
-# clean up
-restore_configs
diff --git a/buildroot/tests/STM32H743VI_btt b/buildroot/tests/STM32H743VI_btt
index b77cdb09c1..ef9bc16bdd 100755
--- a/buildroot/tests/STM32H743VI_btt
+++ b/buildroot/tests/STM32H743VI_btt
@@ -89,6 +89,3 @@ opt_enable PIDTEMPBED ENDSTOP_INTERRUPTS_FEATURE S_CURVE_ACCELERATION \
         MMU_MENUS MMU_SPOOL_JOIN_CONSUMES_ALL_FILAMENT MMU2_DEBUG
 opt_disable Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN FILAMENT_LOAD_UNLOAD_GCODES PARK_HEAD_ON_PAUSE
 exec_test $1 $2 "BigTreeTech SKR 3 EZ | MMU3" "$3"
-
-# clean up
-restore_configs
diff --git a/buildroot/tests/at90usb1286_cdc b/buildroot/tests/at90usb1286_cdc
index 7dcf8d541a..5f775ad83a 100755
--- a/buildroot/tests/at90usb1286_cdc
+++ b/buildroot/tests/at90usb1286_cdc
@@ -12,6 +12,3 @@ set -e
 restore_configs
 opt_set MOTHERBOARD BOARD_BRAINWAVE_PRO
 exec_test $1 $2 "Default Configuration" "$3"
-
-# clean up
-restore_configs
diff --git a/buildroot/tests/at90usb1286_dfu b/buildroot/tests/at90usb1286_dfu
index a753097694..e1317ba074 100755
--- a/buildroot/tests/at90usb1286_dfu
+++ b/buildroot/tests/at90usb1286_dfu
@@ -17,6 +17,3 @@ restore_configs
 opt_set MOTHERBOARD BOARD_PRINTRBOARD_REVF
 opt_enable MINIPANEL
 exec_test $1 $2 "Printrboard RevF with MiniPanel and Stepper DAC (in pins file)" "$3"
-
-# clean up
-restore_configs
diff --git a/buildroot/tests/chitu_f103 b/buildroot/tests/chitu_f103
index 139c480e3e..d09ddf7096 100755
--- a/buildroot/tests/chitu_f103
+++ b/buildroot/tests/chitu_f103
@@ -11,6 +11,3 @@ set -e
 #
 use_example_configs Tronxy/X5SA
 exec_test $1 $2 "Tronxy/X5SA" "$3"
-
-# clean up
-restore_configs
diff --git a/buildroot/tests/jgaurora_a5s_a1_maple b/buildroot/tests/jgaurora_a5s_a1_maple
index e9be89eb30..d59100efc6 100755
--- a/buildroot/tests/jgaurora_a5s_a1_maple
+++ b/buildroot/tests/jgaurora_a5s_a1_maple
@@ -11,6 +11,3 @@ set -e
 #
 use_example_configs JGAurora/A5S
 exec_test $1 $2 "JGAurora/A5S Configuration" "$3"
-
-# clean up
-restore_configs
diff --git a/buildroot/tests/mega1280 b/buildroot/tests/mega1280
index 7e99ee4a60..1d65b5ebf3 100755
--- a/buildroot/tests/mega1280
+++ b/buildroot/tests/mega1280
@@ -60,6 +60,3 @@ opt_set LCD_LANGUAGE cz \
         Z_MIN_ENDSTOP_HIT_STATE HIGH
 opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER DELTA_CALIBRATION_MENU AUTO_BED_LEVELING_BILINEAR BLTOUCH
 exec_test $1 $2 "DELTA | RRD LCD | ABL Bilinear | BLTOUCH" "$3"
-
-# clean up
-restore_configs
diff --git a/buildroot/tests/mega2560 b/buildroot/tests/mega2560
index d61f17b51c..d7a149063c 100755
--- a/buildroot/tests/mega2560
+++ b/buildroot/tests/mega2560
@@ -290,6 +290,3 @@ exec_test $1 $2 "MEGA2560 RAMPS | 128x64 LIGHTWEIGHT_UI | progress rotation" "$3
 opt_disable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
 opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER
 exec_test $1 $2 "MEGA2560 RAMPS | HD44780 | progress rotation" "$3"
-
-# clean up
-restore_configs
diff --git a/buildroot/tests/melzi_optiboot b/buildroot/tests/melzi_optiboot
index 086fcc9169..0d9b87beb4 100755
--- a/buildroot/tests/melzi_optiboot
+++ b/buildroot/tests/melzi_optiboot
@@ -11,6 +11,3 @@ set -e
 #
 use_example_configs Creality/Ender-2
 exec_test $1 $2 "Ender-2" "$3"
-
-# clean up
-restore_configs
diff --git a/buildroot/tests/rambo b/buildroot/tests/rambo
index 698765f263..9ca5d22e8e 100755
--- a/buildroot/tests/rambo
+++ b/buildroot/tests/rambo
@@ -144,6 +144,3 @@ opt_enable COREYX MIXING_EXTRUDER GRADIENT_MIX \
            USE_CONTROLLER_FAN CONTROLLER_FAN_EDITABLE CONTROLLER_FAN_USE_Z_ONLY
 opt_disable DISABLE_OTHER_EXTRUDERS
 exec_test $1 $2 "Rambo | CoreXY, Gradient Mix | Endstop Int. | Home Y > X | FW Retract ..." "$3"
-
-# clean up
-restore_configs
diff --git a/buildroot/tests/sanguino1284p b/buildroot/tests/sanguino1284p
index 7c2aa61f69..345383cc70 100755
--- a/buildroot/tests/sanguino1284p
+++ b/buildroot/tests/sanguino1284p
@@ -23,6 +23,3 @@ restore_configs
 opt_set MOTHERBOARD BOARD_MELZI
 opt_enable ZONESTAR_LCD
 exec_test $1 $2 "Default Configuration | ZONESTAR_LCD " "$3"
-
-# clean up
-restore_configs
diff --git a/buildroot/tests/sanguino644p b/buildroot/tests/sanguino644p
index 12910a76fa..81a202f459 100755
--- a/buildroot/tests/sanguino644p
+++ b/buildroot/tests/sanguino644p
@@ -12,6 +12,3 @@ set -e
 restore_configs
 opt_set MOTHERBOARD BOARD_SANGUINOLOLU_12
 exec_test $1 $2 "Default Configuration" "$3"
-
-# clean up
-restore_configs
diff --git a/buildroot/tests/teensy35 b/buildroot/tests/teensy35
index 0fd1c5820d..0e149e73d9 100755
--- a/buildroot/tests/teensy35
+++ b/buildroot/tests/teensy35
@@ -109,6 +109,3 @@ restore_configs
 opt_set MOTHERBOARD BOARD_TEENSY35_36 Z_DRIVER_TYPE A4988 Z2_DRIVER_TYPE A4988 Z2_MIN_PIN 2 X_MAX_PIN -1
 opt_enable Z_MULTI_ENDSTOPS
 exec_test $1 $2 "Dual Z with Dual Z endstops" "$3"
-
-# Clean up
-restore_configs
diff --git a/buildroot/tests/teensy41 b/buildroot/tests/teensy41
index fc50957b25..e0e573ca43 100755
--- a/buildroot/tests/teensy41
+++ b/buildroot/tests/teensy41
@@ -108,6 +108,3 @@ restore_configs
 opt_set MOTHERBOARD BOARD_TEENSY41 Z_DRIVER_TYPE A4988 Z2_DRIVER_TYPE A4988 Z2_MIN_PIN 2 X_MAX_PIN -1
 opt_enable Z_MULTI_ENDSTOPS
 exec_test $1 $2 "Dual Z with Dual Z endstops" "$3"
-
-# Clean up
-restore_configs