From 1a5e47bd070fd1bf9f89cbac51bd2ef7df4abbec Mon Sep 17 00:00:00 2001 From: Marius Vikhammer Date: Mon, 24 Apr 2023 12:33:54 +0800 Subject: [PATCH] ci: fixed test apps overriding pytest configs --- .../test_apps/bootloader_support/CMakeLists.txt | 3 +-- .../test_apps/rtc_custom_section/CMakeLists.txt | 3 +-- components/console/test_apps/console/CMakeLists.txt | 3 +-- components/esp_common/test_apps/esp_common/CMakeLists.txt | 3 +-- components/esp_event/test_apps/CMakeLists.txt | 3 +-- .../test_apps/esp_hw_support_unity_tests/CMakeLists.txt | 3 +-- components/esp_hw_support/test_apps/rtc_clk/CMakeLists.txt | 3 +-- .../security_support/esp_hw_support_unity_tests/CMakeLists.txt | 3 +-- components/esp_pm/test_apps/esp_pm/CMakeLists.txt | 3 +-- components/esp_ringbuf/test_apps/CMakeLists.txt | 3 +-- .../esp_system/test_apps/esp_system_unity_tests/CMakeLists.txt | 3 +-- components/esp_timer/test_apps/CMakeLists.txt | 3 +-- components/ulp/test_apps/lp_core/CMakeLists.txt | 3 +-- components/ulp/test_apps/ulp_fsm/CMakeLists.txt | 3 +-- components/ulp/test_apps/ulp_riscv/CMakeLists.txt | 3 +-- components/vfs/test_apps/CMakeLists.txt | 3 +-- tools/test_apps/configs/README.md | 3 +-- 17 files changed, 17 insertions(+), 34 deletions(-) diff --git a/components/bootloader_support/test_apps/bootloader_support/CMakeLists.txt b/components/bootloader_support/test_apps/bootloader_support/CMakeLists.txt index c7032d69847..d3ffaaeb9f7 100644 --- a/components/bootloader_support/test_apps/bootloader_support/CMakeLists.txt +++ b/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) diff --git a/components/bootloader_support/test_apps/rtc_custom_section/CMakeLists.txt b/components/bootloader_support/test_apps/rtc_custom_section/CMakeLists.txt index c56be3f5e70..9ee1da748f8 100644 --- a/components/bootloader_support/test_apps/rtc_custom_section/CMakeLists.txt +++ b/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) diff --git a/components/console/test_apps/console/CMakeLists.txt b/components/console/test_apps/console/CMakeLists.txt index 592b202ce8d..12837206f8d 100644 --- a/components/console/test_apps/console/CMakeLists.txt +++ b/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) diff --git a/components/esp_common/test_apps/esp_common/CMakeLists.txt b/components/esp_common/test_apps/esp_common/CMakeLists.txt index 5175d340d13..53d1167cdfa 100644 --- a/components/esp_common/test_apps/esp_common/CMakeLists.txt +++ b/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) diff --git a/components/esp_event/test_apps/CMakeLists.txt b/components/esp_event/test_apps/CMakeLists.txt index e9db1cddb0a..320d15895c7 100644 --- a/components/esp_event/test_apps/CMakeLists.txt +++ b/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) diff --git a/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/CMakeLists.txt b/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/CMakeLists.txt index 2a66fa335e1..fb724b12bba 100644 --- a/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/CMakeLists.txt +++ b/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) diff --git a/components/esp_hw_support/test_apps/rtc_clk/CMakeLists.txt b/components/esp_hw_support/test_apps/rtc_clk/CMakeLists.txt index 9ced12d5546..d259ce59bbc 100644 --- a/components/esp_hw_support/test_apps/rtc_clk/CMakeLists.txt +++ b/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) diff --git a/components/esp_hw_support/test_apps/security_support/esp_hw_support_unity_tests/CMakeLists.txt b/components/esp_hw_support/test_apps/security_support/esp_hw_support_unity_tests/CMakeLists.txt index 963a775caee..64fba888719 100644 --- a/components/esp_hw_support/test_apps/security_support/esp_hw_support_unity_tests/CMakeLists.txt +++ b/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) diff --git a/components/esp_pm/test_apps/esp_pm/CMakeLists.txt b/components/esp_pm/test_apps/esp_pm/CMakeLists.txt index 78b5424a0c8..5ffebff9799 100644 --- a/components/esp_pm/test_apps/esp_pm/CMakeLists.txt +++ b/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) diff --git a/components/esp_ringbuf/test_apps/CMakeLists.txt b/components/esp_ringbuf/test_apps/CMakeLists.txt index 03298867085..18338d23a2e 100644 --- a/components/esp_ringbuf/test_apps/CMakeLists.txt +++ b/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) diff --git a/components/esp_system/test_apps/esp_system_unity_tests/CMakeLists.txt b/components/esp_system/test_apps/esp_system_unity_tests/CMakeLists.txt index 5b00be7c728..1dabba76a07 100644 --- a/components/esp_system/test_apps/esp_system_unity_tests/CMakeLists.txt +++ b/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) diff --git a/components/esp_timer/test_apps/CMakeLists.txt b/components/esp_timer/test_apps/CMakeLists.txt index 751ac01aa48..200a66a8d04 100644 --- a/components/esp_timer/test_apps/CMakeLists.txt +++ b/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) diff --git a/components/ulp/test_apps/lp_core/CMakeLists.txt b/components/ulp/test_apps/lp_core/CMakeLists.txt index 276fd98fd8b..f4ad6a09d6b 100644 --- a/components/ulp/test_apps/lp_core/CMakeLists.txt +++ b/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) diff --git a/components/ulp/test_apps/ulp_fsm/CMakeLists.txt b/components/ulp/test_apps/ulp_fsm/CMakeLists.txt index 3049168de63..e815481cb1e 100644 --- a/components/ulp/test_apps/ulp_fsm/CMakeLists.txt +++ b/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) diff --git a/components/ulp/test_apps/ulp_riscv/CMakeLists.txt b/components/ulp/test_apps/ulp_riscv/CMakeLists.txt index dd825eab2bb..eba0bce5584 100644 --- a/components/ulp/test_apps/ulp_riscv/CMakeLists.txt +++ b/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) diff --git a/components/vfs/test_apps/CMakeLists.txt b/components/vfs/test_apps/CMakeLists.txt index 2d493b33b32..f7223c4d0f8 100644 --- a/components/vfs/test_apps/CMakeLists.txt +++ b/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) diff --git a/tools/test_apps/configs/README.md b/tools/test_apps/configs/README.md index a2cbbd9e968..3e3c63e97b7 100644 --- a/tools/test_apps/configs/README.md +++ b/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`.