From 3d0967a58a2dd02a39e62bbeff12634fe8b67d6c Mon Sep 17 00:00:00 2001
From: Renz Bagaporo <renz.bagaporo@espressif.com>
Date: Sun, 22 Mar 2020 18:30:24 +0800
Subject: [PATCH] test: declare requirements and include dirs private

---
 components/app_trace/test/CMakeLists.txt                      | 4 ++--
 components/app_update/test/CMakeLists.txt                     | 4 ++--
 components/bootloader_support/test/CMakeLists.txt             | 4 ++--
 components/bt/test/CMakeLists.txt                             | 4 ++--
 components/console/test/CMakeLists.txt                        | 2 +-
 components/cxx/test/CMakeLists.txt                            | 4 ++--
 components/driver/test/CMakeLists.txt                         | 4 ++--
 components/efuse/test/CMakeLists.txt                          | 4 ++--
 components/esp32/test/CMakeLists.txt                          | 4 ++--
 components/esp32s2/test/CMakeLists.txt                        | 4 ++--
 components/esp_common/test/CMakeLists.txt                     | 2 +-
 components/esp_eth/test/CMakeLists.txt                        | 2 +-
 components/esp_http_client/test/CMakeLists.txt                | 4 ++--
 components/esp_http_server/test/CMakeLists.txt                | 4 ++--
 components/esp_netif/test/CMakeLists.txt                      | 2 +-
 components/esp_ringbuf/test/CMakeLists.txt                    | 4 ++--
 components/esp_timer/test/CMakeLists.txt                      | 2 +-
 components/esp_wifi/test/CMakeLists.txt                       | 4 ++--
 components/espcoredump/test/CMakeLists.txt                    | 4 ++--
 components/expat/test/CMakeLists.txt                          | 4 ++--
 components/fatfs/test/CMakeLists.txt                          | 4 ++--
 components/freertos/test/CMakeLists.txt                       | 4 ++--
 components/heap/test/CMakeLists.txt                           | 4 ++--
 components/libsodium/test/CMakeLists.txt                      | 4 ++--
 components/mbedtls/test/CMakeLists.txt                        | 4 ++--
 components/newlib/test/CMakeLists.txt                         | 4 ++--
 components/nvs_flash/test/CMakeLists.txt                      | 4 ++--
 components/partition_table/test/CMakeLists.txt                | 4 ++--
 components/perfmon/test/CMakeLists.txt                        | 2 +-
 components/protocomm/test/CMakeLists.txt                      | 4 ++--
 components/pthread/test/CMakeLists.txt                        | 4 ++--
 components/sdmmc/test/CMakeLists.txt                          | 4 ++--
 components/soc/test/CMakeLists.txt                            | 4 ++--
 components/spi_flash/test/CMakeLists.txt                      | 4 ++--
 components/spiffs/test/CMakeLists.txt                         | 4 ++--
 components/tcp_transport/test/CMakeLists.txt                  | 2 +-
 components/ulp/test/CMakeLists.txt                            | 4 ++--
 components/vfs/test/CMakeLists.txt                            | 4 ++--
 components/wear_levelling/test/CMakeLists.txt                 | 4 ++--
 components/wpa_supplicant/test/CMakeLists.txt                 | 4 ++--
 tools/unit-test-app/components/test_utils/test/CMakeLists.txt | 2 +-
 41 files changed, 74 insertions(+), 74 deletions(-)

diff --git a/components/app_trace/test/CMakeLists.txt b/components/app_trace/test/CMakeLists.txt
index 16aca87790..d574eb7ba5 100644
--- 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)
\ No newline at end of file
+                    PRIV_INCLUDE_DIRS "."
+                    PRIV_REQUIRES unity)
\ No newline at end of file
diff --git a/components/app_update/test/CMakeLists.txt b/components/app_update/test/CMakeLists.txt
index 09d19a8219..f140cffa0a 100644
--- 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
                       )
\ No newline at end of file
diff --git a/components/bootloader_support/test/CMakeLists.txt b/components/bootloader_support/test/CMakeLists.txt
index a31c179345..fb3d925668 100644
--- 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)
diff --git a/components/bt/test/CMakeLists.txt b/components/bt/test/CMakeLists.txt
index 0012e8bd17..34fac91ea5 100644
--- 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()
\ No newline at end of file
diff --git a/components/console/test/CMakeLists.txt b/components/console/test/CMakeLists.txt
index 9c41fbaf31..1356216241 100644
--- 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)
diff --git a/components/cxx/test/CMakeLists.txt b/components/cxx/test/CMakeLists.txt
index 16aca87790..d574eb7ba5 100644
--- 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)
\ No newline at end of file
+                    PRIV_INCLUDE_DIRS "."
+                    PRIV_REQUIRES unity)
\ No newline at end of file
diff --git a/components/driver/test/CMakeLists.txt b/components/driver/test/CMakeLists.txt
index 11e9c0474d..05d12cf5ca 100644
--- 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)
diff --git a/components/efuse/test/CMakeLists.txt b/components/efuse/test/CMakeLists.txt
index 794f8e888c..e31eefc226 100644
--- 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
                        )
\ No newline at end of file
diff --git a/components/esp32/test/CMakeLists.txt b/components/esp32/test/CMakeLists.txt
index d9f57f462d..a0940e0477 100644
--- 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"
diff --git a/components/esp32s2/test/CMakeLists.txt b/components/esp32s2/test/CMakeLists.txt
index 41f430e49e..155d8969f0 100644
--- 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"
diff --git a/components/esp_common/test/CMakeLists.txt b/components/esp_common/test/CMakeLists.txt
index 30def4ebd5..20a390731b 100644
--- 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
                     )
\ No newline at end of file
diff --git a/components/esp_eth/test/CMakeLists.txt b/components/esp_eth/test/CMakeLists.txt
index 2f03345364..0be5a5e491 100644
--- 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
                       )
diff --git a/components/esp_http_client/test/CMakeLists.txt b/components/esp_http_client/test/CMakeLists.txt
index 70fc98dcad..202d2fed13 100644
--- 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)
\ No newline at end of file
+                    PRIV_INCLUDE_DIRS "."
+                    PRIV_REQUIRES unity test_utils esp_http_client)
\ No newline at end of file
diff --git a/components/esp_http_server/test/CMakeLists.txt b/components/esp_http_server/test/CMakeLists.txt
index e2ceeb2986..06a638c13b 100644
--- 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)
\ No newline at end of file
+                    PRIV_INCLUDE_DIRS "."
+                    PRIV_REQUIRES unity test_utils esp_http_server)
\ No newline at end of file
diff --git a/components/esp_netif/test/CMakeLists.txt b/components/esp_netif/test/CMakeLists.txt
index 3601d18984..8efc8936ae 100644
--- 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)
\ No newline at end of file
diff --git a/components/esp_ringbuf/test/CMakeLists.txt b/components/esp_ringbuf/test/CMakeLists.txt
index b531a14504..c117151814 100644
--- 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)
\ No newline at end of file
+                    PRIV_INCLUDE_DIRS "."
+                    PRIV_REQUIRES unity test_utils)
\ No newline at end of file
diff --git a/components/esp_timer/test/CMakeLists.txt b/components/esp_timer/test/CMakeLists.txt
index e78a64e2ad..f3ffa1f607 100644
--- 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)
diff --git a/components/esp_wifi/test/CMakeLists.txt b/components/esp_wifi/test/CMakeLists.txt
index fdf279b4a0..9cfc6c49f2 100644
--- 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
                       )
diff --git a/components/espcoredump/test/CMakeLists.txt b/components/espcoredump/test/CMakeLists.txt
index c000ba4e57..72841c52d4 100644
--- 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()
\ No newline at end of file
diff --git a/components/expat/test/CMakeLists.txt b/components/expat/test/CMakeLists.txt
index 28d0afb413..6e5f5cadd7 100644
--- 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)
\ No newline at end of file
+                    PRIV_INCLUDE_DIRS "."
+                    PRIV_REQUIRES unity expat)
\ No newline at end of file
diff --git a/components/fatfs/test/CMakeLists.txt b/components/fatfs/test/CMakeLists.txt
index bb32fd2d9f..d1a90750bf 100644
--- 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
                       )
\ No newline at end of file
diff --git a/components/freertos/test/CMakeLists.txt b/components/freertos/test/CMakeLists.txt
index 6037c945d0..8b3fd3809a 100644
--- 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
                       )
\ No newline at end of file
diff --git a/components/heap/test/CMakeLists.txt b/components/heap/test/CMakeLists.txt
index b70637f263..a04ffe0bbd 100644
--- 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)
\ No newline at end of file
+                    PRIV_INCLUDE_DIRS "."
+                    PRIV_REQUIRES unity test_utils heap)
\ No newline at end of file
diff --git a/components/libsodium/test/CMakeLists.txt b/components/libsodium/test/CMakeLists.txt
index 2e3a43bad6..614a03f854 100644
--- 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.
diff --git a/components/mbedtls/test/CMakeLists.txt b/components/mbedtls/test/CMakeLists.txt
index a12b74795b..b7239e84a8 100644
--- 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)
 
 
diff --git a/components/newlib/test/CMakeLists.txt b/components/newlib/test/CMakeLists.txt
index b531a14504..c117151814 100644
--- 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)
\ No newline at end of file
+                    PRIV_INCLUDE_DIRS "."
+                    PRIV_REQUIRES unity test_utils)
\ No newline at end of file
diff --git a/components/nvs_flash/test/CMakeLists.txt b/components/nvs_flash/test/CMakeLists.txt
index 4f0d184d22..3c35870c69 100644
--- 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)
diff --git a/components/partition_table/test/CMakeLists.txt b/components/partition_table/test/CMakeLists.txt
index b531a14504..c117151814 100644
--- 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)
\ No newline at end of file
+                    PRIV_INCLUDE_DIRS "."
+                    PRIV_REQUIRES unity test_utils)
\ No newline at end of file
diff --git a/components/perfmon/test/CMakeLists.txt b/components/perfmon/test/CMakeLists.txt
index c2b87155cb..9e6fa3868b 100644
--- 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)
diff --git a/components/protocomm/test/CMakeLists.txt b/components/protocomm/test/CMakeLists.txt
index 6e04b5332e..48ba9e1367 100644
--- 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)
\ No newline at end of file
+                    PRIV_REQUIRES unity mbedtls protocomm protobuf-c)
\ No newline at end of file
diff --git a/components/pthread/test/CMakeLists.txt b/components/pthread/test/CMakeLists.txt
index bb02dc7d41..652f74eb7c 100644
--- 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)
\ No newline at end of file
+                    PRIV_INCLUDE_DIRS "."
+                    PRIV_REQUIRES unity test_utils pthread)
\ No newline at end of file
diff --git a/components/sdmmc/test/CMakeLists.txt b/components/sdmmc/test/CMakeLists.txt
index 01dde41cad..6c7d0e1a63 100644
--- 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
                       )
\ No newline at end of file
diff --git a/components/soc/test/CMakeLists.txt b/components/soc/test/CMakeLists.txt
index 17353d3730..096f006af6 100644
--- 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)
diff --git a/components/spi_flash/test/CMakeLists.txt b/components/spi_flash/test/CMakeLists.txt
index 5a3db1ddaf..820b701b6e 100644
--- 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)
 
diff --git a/components/spiffs/test/CMakeLists.txt b/components/spiffs/test/CMakeLists.txt
index 20bfd7a7d4..3c486593d0 100644
--- 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)
\ No newline at end of file
+                    PRIV_INCLUDE_DIRS "."
+                    PRIV_REQUIRES unity test_utils spiffs)
\ No newline at end of file
diff --git a/components/tcp_transport/test/CMakeLists.txt b/components/tcp_transport/test/CMakeLists.txt
index 0d1ac818c9..89846a7538 100644
--- 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)
\ No newline at end of file
diff --git a/components/ulp/test/CMakeLists.txt b/components/ulp/test/CMakeLists.txt
index 78c45d4fec..4d35a94c4b 100644
--- 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")
diff --git a/components/vfs/test/CMakeLists.txt b/components/vfs/test/CMakeLists.txt
index da9ed3c35a..331489b315 100644
--- 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)
diff --git a/components/wear_levelling/test/CMakeLists.txt b/components/wear_levelling/test/CMakeLists.txt
index 765f707cfe..3d32791af8 100644
--- 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
                       )
\ No newline at end of file
diff --git a/components/wpa_supplicant/test/CMakeLists.txt b/components/wpa_supplicant/test/CMakeLists.txt
index e64539d3e0..d1099cc159 100644
--- 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)
 
diff --git a/tools/unit-test-app/components/test_utils/test/CMakeLists.txt b/tools/unit-test-app/components/test_utils/test/CMakeLists.txt
index 55553bc9a1..1ad7802a8a 100644
--- 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)