Enable CONFIG_BUILD_FOR_HOST_UNIT_TEST to fix CHIP test build

project-chip · Apr 12, 2024 · d4827e7 · d4827e7
1 parent 1db304a
commit d4827e7
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 86 deletions.
diff --git a/examples/all-clusters-app/esp32/main/Kconfig.projbuild b/examples/all-clusters-app/esp32/main/Kconfig.projbuild
@@ -59,10 +59,6 @@ menu "Demo"
             depends on IDF_TARGET_ESP32H2
     endchoice
 
-    config CHIP_PROJECT_CONFIG
-        string "CHIP Project Configuration file"
-        default "main/include/CHIPProjectConfig.h"
-
     choice
       prompt "Rendezvous Mode"
       default RENDEZVOUS_MODE_BLE if BT_ENABLED

diff --git a/examples/all-clusters-app/esp32/main/include/CHIPProjectConfig.h b/examples/all-clusters-app/esp32/main/include/CHIPProjectConfig.h
diff --git a/examples/all-clusters-minimal-app/esp32/main/Kconfig.projbuild b/examples/all-clusters-minimal-app/esp32/main/Kconfig.projbuild
@@ -48,10 +48,6 @@ menu "Demo"
             depends on IDF_TARGET_ESP32C2
     endchoice
 
-    config CHIP_PROJECT_CONFIG
-        string "CHIP Project Configuration file"
-        default "main/include/CHIPProjectConfig.h"
-
     choice
       prompt "Rendezvous Mode"
       default RENDEZVOUS_MODE_BLE if BT_ENABLED

diff --git a/examples/all-clusters-minimal-app/esp32/main/include/CHIPProjectConfig.h b/examples/all-clusters-minimal-app/esp32/main/include/CHIPProjectConfig.h
diff --git a/src/platform/ESP32/CHIPPlatformConfig.h b/src/platform/ESP32/CHIPPlatformConfig.h
@@ -101,3 +101,9 @@
 #ifdef CONFIG_CHIP_ENABLE_BDX_LOG_TRANSFER
 #define CHIP_CONFIG_ENABLE_BDX_LOG_TRANSFER 1
 #endif // CONFIG_CHIP_ENABLE_BDX_LOG_TRANSFER
+
+#ifdef CONFIG_BUILD_CHIP_TESTS
+// CHIP tests use APIs that are declared when CONFIG_BUILD_FOR_HOST_UNIT_TEST is enabled
+// Enable CONFIG_BUILD_FOR_HOST_UNIT_TEST when building CHIP test binaries
+#define CONFIG_BUILD_FOR_HOST_UNIT_TEST 1
+#endif
diff --git a/src/test_driver/esp32/main/include/CHIPProjectConfig.h b/src/test_driver/esp32/main/include/CHIPProjectConfig.h
@@ -30,6 +30,4 @@
 // Enable support functions for parsing command-line arguments
 #define CHIP_CONFIG_ENABLE_ARG_PARSER 1
 
-#define CONFIG_BUILD_FOR_HOST_UNIT_TEST 1
-
 #endif // CHIP_PROJECT_CONFIG_H