[efr32] build fix

project-chip · Feb 6, 2024 · 9140933 · 9140933
1 parent c75ad07
commit 9140933
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/src/test_driver/efr32/BUILD.gn b/src/test_driver/efr32/BUILD.gn
@@ -86,6 +86,7 @@ silabs_executable("efr32_device_tests") {
     "${chip_root}/src:tests",
     "${chip_root}/src/lib",
     "${chip_root}/src/lib/support:testing_nlunit",
+    "${chip_root}/src/lib/support:testing_pw",
     "${examples_common_plat_dir}/pw_sys_io:pw_sys_io_silabs",
     "${nlunit_test_root}:nlunit-test",
   ]

diff --git a/src/test_driver/efr32/args.gni b/src/test_driver/efr32/args.gni
@@ -36,7 +36,6 @@ chip_with_lwip = true
 
 pw_rpc_CONFIG = "$dir_pw_rpc:disable_global_mutex"
 
-pw_sys_io_BACKEND = "$dir_pw_sys_io_stdio"
 pw_assert_BACKEND = "$dir_pw_assert_log"
 pw_log_BACKEND = "$dir_pw_log_basic"
 

diff --git a/src/test_driver/efr32/py/BUILD.gn b/src/test_driver/efr32/py/BUILD.gn
@@ -61,7 +61,6 @@ pw_python_package("pw_test_runner") {
     "$dir_pw_hdlc/py",
     "$dir_pw_protobuf_compiler/py",
     "$dir_pw_rpc/py",
-    "${chip_root}/src/test_driver/efr32:pw_test_service.python",
   ]
 }
 

diff --git a/src/test_driver/efr32/src/main.cpp b/src/test_driver/efr32/src/main.cpp
@@ -15,13 +15,17 @@
  *    limitations under the License.
  */
 
+// TODO To prevent config with nl headers has to be included before  nl test headers
+#include <pw_unit_test/unit_test_service.h>
+
 #include <AppConfig.h>
 #include <FreeRTOS.h>
 #include <PigweedLogger.h>
 #include <PigweedLoggerMutex.h>
 #include <cstring>
 #include <lib/support/CHIPMem.h>
 #include <lib/support/CHIPPlatformMemory.h>
+#include <lib/support/UnitTest.h>
 #include <lib/support/UnitTestRegistration.h>
 #include <mbedtls/platform.h>
 #include <nl_test_service/nl_test.rpc.pb.h>
@@ -30,7 +34,6 @@
 #include <platform/CHIPDeviceLayer.h>
 #include <platform/KeyValueStoreManager.h>
 #include <platform/silabs/platformAbstraction/SilabsPlatform.h>
-#include <pw_unit_test/unit_test_service.h>
 #include <sl_system_kernel.h>
 #include <task.h>
 
@@ -54,7 +57,7 @@ class NlTest : public pw_rpc::nanopb::NlTest::Service<NlTest>
         nlTestSetLogger(&nl_test_logger);
 
         RunRegisteredUnitTests();
-        RUN_ALL_TESTS();
+        chip::pw_test::RunAllTests();
 
         stream_writer = nullptr;
         writer.Finish();