[nrfconnect] Provide a workaround for nrfconnect Posix unit tests.

We need to disable all dependencies to the Zephyr net_if module until we switch unit tests to it.
ArekBalysNordic · Mar 27, 2024 · 051a0f5 · 051a0f5
1 parent 926c279
commit 051a0f5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/platform/nrfconnect/BUILD.gn b/src/platform/nrfconnect/BUILD.gn
@@ -28,8 +28,6 @@ static_library("nrfconnect") {
     "../Zephyr/ConfigurationManagerImpl.cpp",
     "../Zephyr/DiagnosticDataProviderImpl.cpp",
     "../Zephyr/DiagnosticDataProviderImpl.h",
-    "../Zephyr/InetUtils.cpp",
-    "../Zephyr/InetUtils.h",
     "../Zephyr/KeyValueStoreManagerImpl.cpp",
     "../Zephyr/Logging.cpp",
     "../Zephyr/PlatformManagerImpl.cpp",
@@ -79,6 +77,13 @@ static_library("nrfconnect") {
     ]
   }
 
+  if (chip_enable_openthread || chip_enable_wifi){
+    sources += [
+      "../Zephyr/InetUtils.cpp",
+      "../Zephyr/InetUtils.h",
+    ]
+  }
+
   if (chip_enable_openthread) {
     sources += [
       "../OpenThread/OpenThreadUtils.cpp",

diff --git a/src/platform/nrfconnect/ConnectivityManagerImpl.cpp b/src/platform/nrfconnect/ConnectivityManagerImpl.cpp
@@ -98,6 +98,7 @@ CHIP_ERROR ConnectivityManagerImpl::_Init()
     ReturnErrorOnFailure(InitWiFi());
 #endif
 
+#if CHIP_DEVICE_CONFIG_ENABLE_THREAD || CHIP_DEVICE_CONFIG_ENABLE_WIFI
     UDPEndPointImplSockets::SetMulticastGroupHandler([](InterfaceId interfaceId, const IPAddress & address, bool join) {
         if (interfaceId.IsPresent())
         {
@@ -115,6 +116,7 @@ CHIP_ERROR ConnectivityManagerImpl::_Init()
 
         return CHIP_NO_ERROR;
     });
+#endif // CHIP_DEVICE_CONFIG_ENABLE_THREAD || CHIP_DEVICE_CONFIG_ENABLE_WIFI
 
     return CHIP_NO_ERROR;
 }