test: declare requirements and include dirs private

2024-10-05 20:47:46 -04:00 · 2020-03-22 18:30:24 +08:00 · 2020-03-22 18:30:24 +08:00 · 3d0967a58a
commit 3d0967a58a
parent 4d9c573fb6
41 changed files with 74 additions and 74 deletions
--- a/components/app_trace/test/CMakeLists.txt
+++ b/components/app_trace/test/CMakeLists.txt
@ -1,3 +1,3 @@
 idf_component_register(SRC_DIRS "."
-                    INCLUDE_DIRS "."
-                    REQUIRES unity)
+                    PRIV_INCLUDE_DIRS "."
+                    PRIV_REQUIRES unity)
--- a/components/app_update/test/CMakeLists.txt
+++ b/components/app_update/test/CMakeLists.txt
@ -1,4 +1,4 @@
 idf_component_register(SRC_DIRS "."
-                       INCLUDE_DIRS "."
-                       REQUIRES unity test_utils app_update bootloader_support nvs_flash
+                       PRIV_INCLUDE_DIRS "."
+                       PRIV_REQUIRES unity test_utils app_update bootloader_support nvs_flash
                      )
--- a/components/bootloader_support/test/CMakeLists.txt
+++ b/components/bootloader_support/test/CMakeLists.txt
@ -1,3 +1,3 @@
 idf_component_register(SRC_DIRS "."
-                    INCLUDE_DIRS "."
-                    REQUIRES unity bootloader_support app_update)
+                    PRIV_INCLUDE_DIRS "."
+                    PRIV_REQUIRES unity bootloader_support app_update)
--- a/components/bt/test/CMakeLists.txt
+++ b/components/bt/test/CMakeLists.txt
@ -1,5 +1,5 @@
 if(CONFIG_BT_ENABLED OR CMAKE_BUILD_EARLY_EXPANSION)
    idf_component_register(SRC_DIRS "."
-                        INCLUDE_DIRS "."
-                        REQUIRES unity nvs_flash bt)
+                        PRIV_INCLUDE_DIRS "."
+                        PRIV_REQUIRES unity nvs_flash bt)
 endif()
--- a/components/console/test/CMakeLists.txt
+++ b/components/console/test/CMakeLists.txt
@ -1,3 +1,3 @@
 idf_component_register(SRC_DIRS .
-                       INCLUDE_DIRS .
+                       PRIV_INCLUDE_DIRS .
                       PRIV_REQUIRES unity test_utils console)
--- a/components/cxx/test/CMakeLists.txt
+++ b/components/cxx/test/CMakeLists.txt
@ -1,3 +1,3 @@
 idf_component_register(SRC_DIRS "."
-                    INCLUDE_DIRS "."
-                    REQUIRES unity)
+                    PRIV_INCLUDE_DIRS "."
+                    PRIV_REQUIRES unity)
--- a/components/driver/test/CMakeLists.txt
+++ b/components/driver/test/CMakeLists.txt
@ -1,3 +1,3 @@
 idf_component_register(SRC_DIRS . param_test
-                       INCLUDE_DIRS include param_test/include
-                       REQUIRES unity test_utils driver nvs_flash esp_serial_slave_link infrared_tools)
+                       PRIV_INCLUDE_DIRS include param_test/include
+                       PRIV_REQUIRES unity test_utils driver nvs_flash esp_serial_slave_link infrared_tools)
--- a/components/efuse/test/CMakeLists.txt
+++ b/components/efuse/test/CMakeLists.txt
@ -1,5 +1,5 @@
 idf_component_register(SRC_DIRS "."
-                       INCLUDE_DIRS "." "include"
+                       PRIV_INCLUDE_DIRS "." "include"
                       PRIV_INCLUDE_DIRS "../private_include"
-                       REQUIRES unity test_utils efuse bootloader_support
+                       PRIV_REQUIRES unity test_utils efuse bootloader_support
                       )
--- a/components/esp32/test/CMakeLists.txt
+++ b/components/esp32/test/CMakeLists.txt
@ -1,7 +1,7 @@
 if(IDF_TARGET STREQUAL "esp32")
    idf_component_register(SRC_DIRS .
-                        INCLUDE_DIRS . ${CMAKE_CURRENT_BINARY_DIR}
-                        REQUIRES unity test_utils nvs_flash ulp esp_common
+                        PRIV_INCLUDE_DIRS . ${CMAKE_CURRENT_BINARY_DIR}
+                        PRIV_REQUIRES unity test_utils nvs_flash ulp esp_common
                        )

    add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/test_tjpgd_logo.h"
--- a/components/esp32s2/test/CMakeLists.txt
+++ b/components/esp32s2/test/CMakeLists.txt
@ -1,7 +1,7 @@
 if(IDF_TARGET STREQUAL "esp32s2")
    idf_component_register(SRC_DIRS .
-                        INCLUDE_DIRS . ${CMAKE_CURRENT_BINARY_DIR}
-                        REQUIRES unity test_utils nvs_flash ulp esp_common
+                        PRIV_INCLUDE_DIRS . ${CMAKE_CURRENT_BINARY_DIR}
+                        PRIV_REQUIRES unity test_utils nvs_flash ulp esp_common
                        )

    add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/test_tjpgd_logo.h"
--- a/components/esp_common/test/CMakeLists.txt
+++ b/components/esp_common/test/CMakeLists.txt
@ -1,3 +1,3 @@
 idf_component_register(SRC_DIRS .
-                       REQUIRES unity spi_flash
+                       PRIV_REQUIRES unity spi_flash
                    )
--- a/components/esp_eth/test/CMakeLists.txt
+++ b/components/esp_eth/test/CMakeLists.txt
@ -1,4 +1,4 @@
 idf_component_register(SRC_DIRS .
-                       INCLUDE_DIRS .
+                       PRIV_INCLUDE_DIRS .
                       PRIV_REQUIRES unity test_utils esp_eth esp_http_client
                      )
--- a/components/esp_http_client/test/CMakeLists.txt
+++ b/components/esp_http_client/test/CMakeLists.txt
@ -1,3 +1,3 @@
 idf_component_register(SRC_DIRS "."
-                    INCLUDE_DIRS "."
-                    REQUIRES unity test_utils esp_http_client)
+                    PRIV_INCLUDE_DIRS "."
+                    PRIV_REQUIRES unity test_utils esp_http_client)
--- a/components/esp_http_server/test/CMakeLists.txt
+++ b/components/esp_http_server/test/CMakeLists.txt
@ -1,3 +1,3 @@
 idf_component_register(SRC_DIRS "."
-                    INCLUDE_DIRS "."
-                    REQUIRES unity test_utils esp_http_server)
+                    PRIV_INCLUDE_DIRS "."
+                    PRIV_REQUIRES unity test_utils esp_http_server)
--- a/components/esp_netif/test/CMakeLists.txt
+++ b/components/esp_netif/test/CMakeLists.txt
@ -1,3 +1,3 @@
 idf_component_register(SRC_DIRS "."
-                    INCLUDE_DIRS  "../private_include" "."
+                    PRIV_INCLUDE_DIRS  "../private_include" "."
                    PRIV_REQUIRES unity test_utils esp_netif nvs_flash)
--- a/components/esp_ringbuf/test/CMakeLists.txt
+++ b/components/esp_ringbuf/test/CMakeLists.txt
@ -1,3 +1,3 @@
 idf_component_register(SRC_DIRS "."
-                    INCLUDE_DIRS "."
-                    REQUIRES unity test_utils)
+                    PRIV_INCLUDE_DIRS "."
+                    PRIV_REQUIRES unity test_utils)
--- a/components/esp_timer/test/CMakeLists.txt
+++ b/components/esp_timer/test/CMakeLists.txt
@ -1,6 +1,6 @@
 idf_component_register(SRC_DIRS "."
                       PRIV_INCLUDE_DIRS "../private_include"
-                       REQUIRES unity test_utils)
+                       PRIV_REQUIRES unity test_utils)

 if(CONFIG_ESP_TIMER_IMPL_FRC2)
    idf_build_set_property(COMPILE_DEFINITIONS "-DESP_TIMER_DYNAMIC_OVERFLOW_VAL" APPEND)
--- a/components/esp_wifi/test/CMakeLists.txt
+++ b/components/esp_wifi/test/CMakeLists.txt
@ -1,4 +1,4 @@
 idf_component_register(SRC_DIRS .
-                       INCLUDE_DIRS . ${CMAKE_CURRENT_BINARY_DIR}
-                       REQUIRES unity test_utils nvs_flash ulp esp_common
+                       PRIV_INCLUDE_DIRS . ${CMAKE_CURRENT_BINARY_DIR}
+                       PRIV_REQUIRES unity test_utils nvs_flash ulp esp_common
                      )
--- a/components/espcoredump/test/CMakeLists.txt
+++ b/components/espcoredump/test/CMakeLists.txt
@ -2,6 +2,6 @@ if(TESTS_ALL EQUAL 1)
    message("not linking coredump test from CI.")
 else()
    idf_component_register(SRC_DIRS "."
-                        INCLUDE_DIRS "."
-                        REQUIRES unity nvs_flash)
+                        PRIV_INCLUDE_DIRS "."
+                        PRIV_REQUIRES unity nvs_flash)
 endif()
--- a/components/expat/test/CMakeLists.txt
+++ b/components/expat/test/CMakeLists.txt
@ -1,3 +1,3 @@
 idf_component_register(SRC_DIRS "."
-                    INCLUDE_DIRS "."
-                    REQUIRES unity expat)
+                    PRIV_INCLUDE_DIRS "."
+                    PRIV_REQUIRES unity expat)
--- a/components/fatfs/test/CMakeLists.txt
+++ b/components/fatfs/test/CMakeLists.txt
@ -1,5 +1,5 @@
 idf_component_register(SRC_DIRS .
-                       INCLUDE_DIRS .
-                       REQUIRES unity test_utils vfs fatfs
+                       PRIV_INCLUDE_DIRS .
+                       PRIV_REQUIRES unity test_utils vfs fatfs
                       EMBED_TXTFILES fatfs.img
                      )
--- a/components/freertos/test/CMakeLists.txt
+++ b/components/freertos/test/CMakeLists.txt
@ -1,4 +1,4 @@
 idf_component_register(SRC_DIRS .
-                       INCLUDE_DIRS .
-                       REQUIRES unity test_utils
+                       PRIV_INCLUDE_DIRS .
+                       PRIV_REQUIRES unity test_utils
                      )
--- a/components/heap/test/CMakeLists.txt
+++ b/components/heap/test/CMakeLists.txt
@ -1,3 +1,3 @@
 idf_component_register(SRC_DIRS "."
-                    INCLUDE_DIRS "."
-                    REQUIRES unity test_utils heap)
+                    PRIV_INCLUDE_DIRS "."
+                    PRIV_REQUIRES unity test_utils heap)
--- a/components/libsodium/test/CMakeLists.txt
+++ b/components/libsodium/test/CMakeLists.txt
@ -11,8 +11,8 @@ else()
    endforeach()

    idf_component_register(SRCS "${TEST_CASES_FILES}" "test_sodium.c"
-                        INCLUDE_DIRS "." "${LS_TESTDIR}/../quirks"
-                        REQUIRES unity libsodium)
+                        PRIV_INCLUDE_DIRS "." "${LS_TESTDIR}/../quirks"
+                        PRIV_REQUIRES unity libsodium)

    # The libsodium test suite is designed to be run each test case as an executable on a desktop computer and uses
    # filesytem to write & then compare contents of each file.
--- a/components/mbedtls/test/CMakeLists.txt
+++ b/components/mbedtls/test/CMakeLists.txt
@ -1,6 +1,6 @@
 idf_component_register(SRC_DIRS "."
-                    INCLUDE_DIRS "."
-                    REQUIRES unity test_utils mbedtls libsodium
+                    PRIV_INCLUDE_DIRS "."
+                    PRIV_REQUIRES unity test_utils mbedtls libsodium
                    EMBED_TXTFILES server_cert_chain.pem prvtkey.pem server_cert_bundle)


--- a/components/newlib/test/CMakeLists.txt
+++ b/components/newlib/test/CMakeLists.txt
@ -1,3 +1,3 @@
 idf_component_register(SRC_DIRS "."
-                    INCLUDE_DIRS "."
-                    REQUIRES unity test_utils)
+                    PRIV_INCLUDE_DIRS "."
+                    PRIV_REQUIRES unity test_utils)
--- a/components/nvs_flash/test/CMakeLists.txt
+++ b/components/nvs_flash/test/CMakeLists.txt
@ -1,3 +1,3 @@
 idf_component_register(SRC_DIRS "."
-                    INCLUDE_DIRS "."
-                    REQUIRES unity test_utils nvs_flash bootloader_support)
+                    PRIV_INCLUDE_DIRS "."
+                    PRIV_REQUIRES unity test_utils nvs_flash bootloader_support)
--- a/components/partition_table/test/CMakeLists.txt
+++ b/components/partition_table/test/CMakeLists.txt
@ -1,3 +1,3 @@
 idf_component_register(SRC_DIRS "."
-                    INCLUDE_DIRS "."
-                    REQUIRES unity test_utils)
+                    PRIV_INCLUDE_DIRS "."
+                    PRIV_REQUIRES unity test_utils)
--- a/components/perfmon/test/CMakeLists.txt
+++ b/components/perfmon/test/CMakeLists.txt
@ -1,3 +1,3 @@
 idf_component_register(SRC_DIRS "."
-                    INCLUDE_DIRS "."
+                    PRIV_INCLUDE_DIRS "."
                    PRIV_REQUIRES unity xtensa perfmon)
--- a/components/protocomm/test/CMakeLists.txt
+++ b/components/protocomm/test/CMakeLists.txt
@ -1,4 +1,4 @@
 idf_component_register(SRC_DIRS "."
-                    INCLUDE_DIRS "."
+                    PRIV_INCLUDE_DIRS "."
                    PRIV_INCLUDE_DIRS "../proto-c/"
-                    REQUIRES unity mbedtls protocomm protobuf-c)
+                    PRIV_REQUIRES unity mbedtls protocomm protobuf-c)
--- a/components/pthread/test/CMakeLists.txt
+++ b/components/pthread/test/CMakeLists.txt
@ -1,3 +1,3 @@
 idf_component_register(SRC_DIRS "."
-                    INCLUDE_DIRS "."
-                    REQUIRES unity test_utils pthread)
+                    PRIV_INCLUDE_DIRS "."
+                    PRIV_REQUIRES unity test_utils pthread)
--- a/components/sdmmc/test/CMakeLists.txt
+++ b/components/sdmmc/test/CMakeLists.txt
@ -1,4 +1,4 @@
 idf_component_register(SRC_DIRS "."
-                       INCLUDE_DIRS "."
-                       REQUIRES unity sdmmc
+                       PRIV_INCLUDE_DIRS "."
+                       PRIV_REQUIRES unity sdmmc
                      )
--- a/components/soc/test/CMakeLists.txt
+++ b/components/soc/test/CMakeLists.txt
@ -1,5 +1,5 @@
 idf_build_get_property(soc_name IDF_TARGET)

 idf_component_register(SRC_DIRS "."
-                    INCLUDE_DIRS "${include_dirs}"
-                    REQUIRES unity test_utils)
+                    PRIV_INCLUDE_DIRS "${include_dirs}"
+                    PRIV_REQUIRES unity test_utils)
--- a/components/spi_flash/test/CMakeLists.txt
+++ b/components/spi_flash/test/CMakeLists.txt
@ -4,6 +4,6 @@ endif()

 idf_component_register(SRC_DIRS "."
                       EXCLUDE_SRCS "${exclude_srcs}"
-                       INCLUDE_DIRS "."
-                       REQUIRES unity test_utils spi_flash bootloader_support app_update)
+                       PRIV_INCLUDE_DIRS "."
+                       PRIV_REQUIRES unity test_utils spi_flash bootloader_support app_update)

--- a/components/spiffs/test/CMakeLists.txt
+++ b/components/spiffs/test/CMakeLists.txt
@ -1,3 +1,3 @@
 idf_component_register(SRC_DIRS "."
-                    INCLUDE_DIRS "."
-                    REQUIRES unity test_utils spiffs)
+                    PRIV_INCLUDE_DIRS "."
+                    PRIV_REQUIRES unity test_utils spiffs)
--- a/components/tcp_transport/test/CMakeLists.txt
+++ b/components/tcp_transport/test/CMakeLists.txt
@ -1,3 +1,3 @@
 idf_component_register(SRC_DIRS "."
-                    INCLUDE_DIRS "../private_include" "."
+                    PRIV_INCLUDE_DIRS "../private_include" "."
                    PRIV_REQUIRES unity test_utils tcp_transport)
--- a/components/ulp/test/CMakeLists.txt
+++ b/components/ulp/test/CMakeLists.txt
@ -1,7 +1,7 @@
 if(IDF_TARGET STREQUAL "esp32")
    idf_component_register(SRC_DIRS esp32
-                        INCLUDE_DIRS .
-                        REQUIRES unity ulp soc esp_common)
+                        PRIV_INCLUDE_DIRS .
+                        PRIV_REQUIRES unity ulp soc esp_common)

    set(ulp_app_name ulp_test_app)
    set(ulp_s_sources "ulp/test_jumps_esp32.S")
--- a/components/vfs/test/CMakeLists.txt
+++ b/components/vfs/test/CMakeLists.txt
@ -1,3 +1,3 @@
 idf_component_register(SRC_DIRS "."
-                       INCLUDE_DIRS .
-                       REQUIRES unity test_utils vfs fatfs spiffs)
+                       PRIV_INCLUDE_DIRS .
+                       PRIV_REQUIRES unity test_utils vfs fatfs spiffs)
--- a/components/wear_levelling/test/CMakeLists.txt
+++ b/components/wear_levelling/test/CMakeLists.txt
@ -1,5 +1,5 @@
 idf_component_register(SRC_DIRS .
-                       INCLUDE_DIRS .
-                       REQUIRES unity test_utils wear_levelling
+                       PRIV_INCLUDE_DIRS .
+                       PRIV_REQUIRES unity test_utils wear_levelling
                       EMBED_FILES test_partition_v1.bin
                      )
--- a/components/wpa_supplicant/test/CMakeLists.txt
+++ b/components/wpa_supplicant/test/CMakeLists.txt
@ -1,7 +1,7 @@
 idf_component_register(SRC_DIRS "."
-                    INCLUDE_DIRS "." "${CMAKE_CURRENT_BINARY_DIR}"
+                    PRIV_INCLUDE_DIRS "." "${CMAKE_CURRENT_BINARY_DIR}"
                    PRIV_INCLUDE_DIRS "../src"
-                    REQUIRES unity esp_common test_utils wpa_supplicant mbedtls)
+                    PRIV_REQUIRES unity esp_common test_utils wpa_supplicant mbedtls)

 idf_component_get_property(esp_supplicant_dir wpa_supplicant COMPONENT_DIR)

--- a/tools/unit-test-app/components/test_utils/test/CMakeLists.txt
+++ b/tools/unit-test-app/components/test_utils/test/CMakeLists.txt
@ -1,3 +1,3 @@
 idf_component_register(SRC_DIRS "."
    PRIV_INCLUDE_DIRS "."
-    REQUIRES unity test_utils perfmon)
+    PRIV_REQUIRES unity test_utils perfmon)