Преглед изворни кода

ci: fixed test apps overriding pytest configs

Marius Vikhammer пре 2 година
родитељ
комит
1a5e47bd07

+ 1 - 2
components/bootloader_support/test_apps/bootloader_support/CMakeLists.txt

@@ -4,8 +4,7 @@ cmake_minimum_required(VERSION 3.16)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 
-set(SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers")
-list(APPEND SDKCONFIG_DEFAULTS "sdkconfig.defaults")
+list(PREPEND SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers" "sdkconfig.defaults")
 
 # "Trim" the build. Include the minimal set of components, main, and anything it depends on.
 set(COMPONENTS main)

+ 1 - 2
components/bootloader_support/test_apps/rtc_custom_section/CMakeLists.txt

@@ -4,8 +4,7 @@ cmake_minimum_required(VERSION 3.16)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 
-set(SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers")
-list(APPEND SDKCONFIG_DEFAULTS "sdkconfig.defaults")
+list(PREPEND SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers" "sdkconfig.defaults")
 
 # "Trim" the build. Include the minimal set of components, main, and anything it depends on.
 set(COMPONENTS main)

+ 1 - 2
components/console/test_apps/console/CMakeLists.txt

@@ -4,8 +4,7 @@ cmake_minimum_required(VERSION 3.16)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 
-set(SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers")
-list(APPEND SDKCONFIG_DEFAULTS "sdkconfig.defaults")
+list(PREPEND SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers" "sdkconfig.defaults")
 
 # "Trim" the build. Include the minimal set of components, main, and anything it depends on.
 set(COMPONENTS main)

+ 1 - 2
components/esp_common/test_apps/esp_common/CMakeLists.txt

@@ -4,8 +4,7 @@ cmake_minimum_required(VERSION 3.16)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 
-set(SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers")
-list(APPEND SDKCONFIG_DEFAULTS "sdkconfig.defaults")
+list(PREPEND SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers" "sdkconfig.defaults")
 
 # "Trim" the build. Include the minimal set of components, main, and anything it depends on.
 set(COMPONENTS main)

+ 1 - 2
components/esp_event/test_apps/CMakeLists.txt

@@ -5,8 +5,7 @@ cmake_minimum_required(VERSION 3.16)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 
-set(SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers")
-list(APPEND SDKCONFIG_DEFAULTS "sdkconfig.defaults")
+list(PREPEND SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers" "sdkconfig.defaults")
 
 # "Trim" the build. Include the minimal set of components, main, and anything it depends on.
 set(COMPONENTS main)

+ 1 - 2
components/esp_hw_support/test_apps/esp_hw_support_unity_tests/CMakeLists.txt

@@ -4,8 +4,7 @@ cmake_minimum_required(VERSION 3.16)
 set(COMPONENTS main)
 set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components")
 
-set(SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers")
-list(APPEND SDKCONFIG_DEFAULTS "sdkconfig.defaults")
+list(PREPEND SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers" "sdkconfig.defaults")
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(esp_hw_support_unity)

+ 1 - 2
components/esp_hw_support/test_apps/rtc_clk/CMakeLists.txt

@@ -4,8 +4,7 @@ cmake_minimum_required(VERSION 3.16)
 set(COMPONENTS main)
 set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components")
 
-set(SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers")
-list(APPEND SDKCONFIG_DEFAULTS "sdkconfig.defaults")
+list(PREPEND SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers" "sdkconfig.defaults")
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(rtc_clk)

+ 1 - 2
components/esp_hw_support/test_apps/security_support/esp_hw_support_unity_tests/CMakeLists.txt

@@ -4,8 +4,7 @@ cmake_minimum_required(VERSION 3.16)
 set(COMPONENTS main)
 set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components")
 
-set(SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers")
-list(APPEND SDKCONFIG_DEFAULTS "sdkconfig.defaults")
+list(PREPEND SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers" "sdkconfig.defaults")
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(test_app_security_support)

+ 1 - 2
components/esp_pm/test_apps/esp_pm/CMakeLists.txt

@@ -2,8 +2,7 @@
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)
 
-set(SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers")
-list(APPEND SDKCONFIG_DEFAULTS "sdkconfig.defaults")
+list(PREPEND SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers" "sdkconfig.defaults")
 
 # "Trim" the build. Include the minimal set of components, main, and anything it depends on.
 set(COMPONENTS main)

+ 1 - 2
components/esp_ringbuf/test_apps/CMakeLists.txt

@@ -2,8 +2,7 @@
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)
 
-set(SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers")
-list(APPEND SDKCONFIG_DEFAULTS "sdkconfig.defaults")
+list(PREPEND SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers")
 
 # "Trim" the build. Include the minimal set of components, main, and anything it depends on.
 set(COMPONENTS main)

+ 1 - 2
components/esp_system/test_apps/esp_system_unity_tests/CMakeLists.txt

@@ -4,8 +4,7 @@ cmake_minimum_required(VERSION 3.16)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 
-set(SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers")
-list(APPEND SDKCONFIG_DEFAULTS "sdkconfig.defaults")
+list(PREPEND SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers" "sdkconfig.defaults")
 
 # "Trim" the build. Include the minimal set of components, main, and anything it depends on.
 set(COMPONENTS main)

+ 1 - 2
components/esp_timer/test_apps/CMakeLists.txt

@@ -1,8 +1,7 @@
 #This is the project CMakeLists.txt file for the test subproject
 cmake_minimum_required(VERSION 3.16)
 
-set(SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers")
-list(APPEND SDKCONFIG_DEFAULTS "sdkconfig.defaults")
+list(PREPEND SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers" "sdkconfig.defaults")
 
 # "Trim" the build. Include the minimal set of components, main, and anything it depends on.
 set(COMPONENTS main)

+ 1 - 2
components/ulp/test_apps/lp_core/CMakeLists.txt

@@ -1,8 +1,7 @@
 # This is the project CMakeLists.txt file for the test subproject
 cmake_minimum_required(VERSION 3.16)
 
-set(SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers")
-list(APPEND SDKCONFIG_DEFAULTS "sdkconfig.defaults")
+list(PREPEND SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers" "sdkconfig.defaults")
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(lp_core_test)

+ 1 - 2
components/ulp/test_apps/ulp_fsm/CMakeLists.txt

@@ -1,8 +1,7 @@
 # This is the project CMakeLists.txt file for the test subproject
 cmake_minimum_required(VERSION 3.16)
 
-set(SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers")
-list(APPEND SDKCONFIG_DEFAULTS "sdkconfig.defaults")
+list(PREPEND SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers" "sdkconfig.defaults")
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(ulp_fsm_test)

+ 1 - 2
components/ulp/test_apps/ulp_riscv/CMakeLists.txt

@@ -1,8 +1,7 @@
 # This is the project CMakeLists.txt file for the test subproject
 cmake_minimum_required(VERSION 3.16)
 
-set(SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers")
-list(APPEND SDKCONFIG_DEFAULTS "sdkconfig.defaults")
+list(PREPEND SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers" "sdkconfig.defaults")
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(ulp_riscv_test)

+ 1 - 2
components/vfs/test_apps/CMakeLists.txt

@@ -3,8 +3,7 @@ cmake_minimum_required(VERSION 3.5)
 
 set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components")
 
-list(APPEND SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers")
-list(APPEND SDKCONFIG_DEFAULTS "sdkconfig.defaults")
+list(PREPEND SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers" "sdkconfig.defaults")
 
 set(COMPONENTS main)
 

+ 1 - 2
tools/test_apps/configs/README.md

@@ -7,8 +7,7 @@ To facilitiate re-use, this folder contains some of the most common ones.
 These can then be added to the list of default configs in test apps:
 
 ```
-set(SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers")
-list(APPEND SDKCONFIG_DEFAULTS "sdkconfig.defaults")
+list(PREPEND SDKCONFIG_DEFAULTS "$ENV{IDF_PATH}/tools/test_apps/configs/sdkconfig.debug_helpers" "sdkconfig.defaults")
 ```
 
 Note that this must be set in the top-level project `CMakelist.txt`.