project-chip · andy31415 · Dec 1, 2020 · Nov 26, 2020 · Dec 1, 2020 · Dec 1, 2020
diff --git a/src/system/tests/BUILD.gn b/src/system/tests/BUILD.gn
@@ -20,9 +20,8 @@ import("${chip_root}/build/chip/chip_test_suite.gni")
 chip_test_suite("tests") {
   output_name = "libSystemLayerTests"
 
-  sources = [
+  test_sources = [
     "TestSystemErrorStr.cpp",
-    "TestSystemLayer.h",
     "TestSystemObject.cpp",
     "TestSystemPacketBuffer.cpp",
     "TestSystemTimer.cpp",
@@ -37,13 +36,4 @@ chip_test_suite("tests") {
     "${chip_root}/src/system",
     "${nlunit_test_root}:nlunit-test",
   ]
-
-  tests = [
-    "TestSystemErrorStr",
-    "TestSystemObject",
-    "TestSystemPacketBuffer",
-    "TestSystemTimer",
-    "TestSystemWakeEvent",
-    "TestTimeSource",
-  ]
 }
diff --git a/src/system/tests/TestSystemErrorStr.cpp b/src/system/tests/TestSystemErrorStr.cpp
@@ -32,8 +32,6 @@
 #define __STDC_LIMIT_MACROS
 #endif
 
-#include "TestSystemLayer.h"
-
 #include <inttypes.h>
 #include <stdint.h>
 #include <string.h>

diff --git a/src/system/tests/TestSystemErrorStrDriver.cpp b/src/system/tests/TestSystemErrorStrDriver.cpp
diff --git a/src/system/tests/TestSystemLayer.h b/src/system/tests/TestSystemLayer.h
diff --git a/src/system/tests/TestSystemObject.cpp b/src/system/tests/TestSystemObject.cpp
@@ -28,8 +28,6 @@
 #define __STDC_LIMIT_MACROS
 #endif
 
-#include "TestSystemLayer.h"
-
 // Install a sleep in the high water mark function, to force
 // collisions between the threads that call it.
 
@@ -528,6 +526,9 @@ static int Finalize(void * aContext)
 
 int TestSystemObject(void)
 {
+    // Initialize standard pseudo-random number generator
+    srand(0);
+
     // Run test suit againt one lContext.
     nlTestRunner(&sTestSuite, &chip::System::sContext);
 

diff --git a/src/system/tests/TestSystemObjectDriver.cpp b/src/system/tests/TestSystemObjectDriver.cpp
diff --git a/src/system/tests/TestSystemPacketBuffer.cpp b/src/system/tests/TestSystemPacketBuffer.cpp
@@ -27,8 +27,6 @@
 #define __STDC_LIMIT_MACROS
 #endif
 
-#include "TestSystemLayer.h"
-
 #include <errno.h>
 #include <stdint.h>
 #include <stdlib.h>
@@ -1208,6 +1206,10 @@ int TestTeardown(void * inContext)
 
 int TestSystemPacketBuffer(void)
 {
+#if CHIP_SYSTEM_CONFIG_USE_LWIP
+    tcpip_init(NULL, NULL);
+#endif // CHIP_SYSTEM_CONFIG_USE_LWIP
+
     // clang-format off
     nlTestSuite theSuite =
 	{

diff --git a/src/system/tests/TestSystemPacketBufferDriver.cpp b/src/system/tests/TestSystemPacketBufferDriver.cpp
diff --git a/src/system/tests/TestSystemTimer.cpp b/src/system/tests/TestSystemTimer.cpp
@@ -26,11 +26,8 @@
 #ifndef __STDC_LIMIT_MACROS
 #define __STDC_LIMIT_MACROS
 #endif
-// config
-#include <system/SystemConfig.h>
 
-// module header
-#include "TestSystemLayer.h"
+#include <system/SystemConfig.h>
 
 #include <nlunit-test.h>
 #include <support/CodeUtils.h>

diff --git a/src/system/tests/TestSystemTimerDriver.cpp b/src/system/tests/TestSystemTimerDriver.cpp
diff --git a/src/system/tests/TestSystemWakeEvent.cpp b/src/system/tests/TestSystemWakeEvent.cpp
@@ -24,11 +24,8 @@
 #ifndef __STDC_LIMIT_MACROS
 #define __STDC_LIMIT_MACROS
 #endif
-// config
-#include <system/SystemConfig.h>
 
-// module header
-#include "TestSystemLayer.h"
+#include <system/SystemConfig.h>
 
 #include <nlunit-test.h>
 #include <support/CodeUtils.h>

diff --git a/src/system/tests/TestSystemWakeEventDriver.cpp b/src/system/tests/TestSystemWakeEventDriver.cpp
diff --git a/src/system/tests/TestTimeSource.cpp b/src/system/tests/TestTimeSource.cpp
@@ -24,11 +24,8 @@
 #ifndef __STDC_LIMIT_MACROS
 #define __STDC_LIMIT_MACROS
 #endif
-// config
-#include <system/SystemConfig.h>
 
-// module header
-#include "TestSystemLayer.h"
+#include <system/SystemConfig.h>
 
 #include <nlunit-test.h>
 #include <support/CodeUtils.h>

diff --git a/src/system/tests/TestTimeSourceDriver.cpp b/src/system/tests/TestTimeSourceDriver.cpp