Skip to content

Commit 4065fb2

Browse files
ESP-MariusESP-Marius
committed
Merge branch 'feature/esp_test_utils_component' into 'master'
change(test_utils): moved test_utils out of unit-test-app project See merge request espressif/esp-idf!40678
2 parents 1c08475 + bf84ab6 commit 4065fb2

File tree

82 files changed

+80
-79
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+80
-79
lines changed

‎.gitlab/CODEOWNERS‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -230,15 +230,16 @@
230230
/tools/test_apps/README.md @esp-idf-codeowners/docs @esp-idf-codeowners/ci
231231

232232
## Note: owners here should be the same as the owners for the same example subdir, above
233-
/tools/test_apps/build_system/ @esp-idf-codeowners/build-config
234-
/tools/test_apps/configs/ @esp-idf-codeowners/system
235-
/tools/test_apps/linux_compatible/ @esp-idf-codeowners/system
236-
/tools/test_apps/peripherals/ @esp-idf-codeowners/peripherals
237-
/tools/test_apps/phy/ @esp-idf-codeowners/bluetooth @esp-idf-codeowners/wifi @esp-idf-codeowners/ieee802154
238-
/tools/test_apps/protocols/ @esp-idf-codeowners/network @esp-idf-codeowners/app-utilities
239-
/tools/test_apps/security/ @esp-idf-codeowners/security
240-
/tools/test_apps/storage/ @esp-idf-codeowners/storage
241-
/tools/test_apps/system/ @esp-idf-codeowners/system
233+
/tools/test_apps/build_system/ @esp-idf-codeowners/build-config
234+
/tools/test_apps/components/test_utils/ @esp-idf-codeowners/peripherals @esp-idf-codeowners/system
235+
/tools/test_apps/configs/ @esp-idf-codeowners/system
236+
/tools/test_apps/linux_compatible/ @esp-idf-codeowners/system
237+
/tools/test_apps/peripherals/ @esp-idf-codeowners/peripherals
238+
/tools/test_apps/phy/ @esp-idf-codeowners/bluetooth @esp-idf-codeowners/wifi @esp-idf-codeowners/ieee802154
239+
/tools/test_apps/protocols/ @esp-idf-codeowners/network @esp-idf-codeowners/app-utilities
240+
/tools/test_apps/security/ @esp-idf-codeowners/security
241+
/tools/test_apps/storage/ @esp-idf-codeowners/storage
242+
/tools/test_apps/system/ @esp-idf-codeowners/system
242243

243244
/tools/test_apps/**/*.py @esp-idf-codeowners/ci @esp-idf-codeowners/tools
244245

‎components/app_update/test_apps/test_app_update/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#This is the project CMakeLists.txt file for the test subproject
22
cmake_minimum_required(VERSION 3.16)
33

4-
set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components")
4+
set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/test_apps/components")
55
set(COMPONENTS main)
66

77
include($ENV{IDF_PATH}/tools/cmake/project.cmake)

‎components/driver/test_apps/legacy_i2c_driver/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
cmake_minimum_required(VERSION 3.16)
33

44
set(EXTRA_COMPONENT_DIRS
5-
"$ENV{IDF_PATH}/tools/unit-test-app/components"
5+
"$ENV{IDF_PATH}/tools/test_apps/components"
66
)
77

88
# "Trim" the build. Include the minimal set of components, main, and anything it depends on. We also depend on esp_pm

‎components/esp-tls/test_apps/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#This is the project CMakeLists.txt file for the test subproject
22
cmake_minimum_required(VERSION 3.16)
33

4-
set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components")
4+
set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/test_apps/components")
55
set(COMPONENTS main)
66

77
include($ENV{IDF_PATH}/tools/cmake/project.cmake)

‎components/esp_adc/test_apps/adc/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This is the project CMakeLists.txt file for the test subproject
22
cmake_minimum_required(VERSION 3.16)
33

4-
set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components")
4+
set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/test_apps/components")
55

66
# "Trim" the build. Include the minimal set of components, main, and anything it depends on.
77
set(COMPONENTS main)

‎components/esp_driver_bitscrambler/test_apps/bitscrambler/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cmake_minimum_required(VERSION 3.16)
22

3-
list(APPEND EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components")
3+
list(APPEND EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/test_apps/components")
44

55
set(COMPONENTS main)
66

‎components/esp_driver_cam/test_apps/csi/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cmake_minimum_required(VERSION 3.16)
22

3-
list(APPEND EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components")
3+
list(APPEND EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/test_apps/components")
44

55
set(COMPONENTS main)
66

‎components/esp_driver_cam/test_apps/dvp/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cmake_minimum_required(VERSION 3.16)
22

3-
list(APPEND EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components")
3+
list(APPEND EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/test_apps/components")
44

55
set(COMPONENTS main)
66

‎components/esp_driver_i2c/test_apps/i2c_test_apps/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 3.16)
55
set(COMPONENTS main)
66

77
set(EXTRA_COMPONENT_DIRS
8-
"$ENV{IDF_PATH}/tools/unit-test-app/components"
8+
"$ENV{IDF_PATH}/tools/test_apps/components"
99
)
1010

1111
include($ENV{IDF_PATH}/tools/cmake/project.cmake)

‎components/esp_driver_i2s/test_apps/i2s_multi_dev/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.16)
66
set(COMPONENTS main)
77

88
set(EXTRA_COMPONENT_DIRS
9-
"$ENV{IDF_PATH}/tools/unit-test-app/components"
9+
"$ENV{IDF_PATH}/tools/test_apps/components"
1010
)
1111

1212
include($ENV{IDF_PATH}/tools/cmake/project.cmake)

0 commit comments

Comments
 (0)