Move src/inet/tests to auto-test-driver generation (project-chip#3997)

hnnajh · Dec 10, 2020 · eea78f6 · eea78f6
1 parent ade5ac5
commit eea78f6
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 167 deletions.
diff --git a/src/inet/tests/BUILD.gn b/src/inet/tests/BUILD.gn
@@ -27,16 +27,18 @@ config("tests_config") {
 chip_test_suite("tests") {
   output_name = "libInetLayerTests"
 
-  sources = [
+  test_sources = [
     "TestInetAddress.cpp",
+    "TestInetEndPoint.cpp",
+    "TestInetErrorStr.cpp",
+  ]
+
+  sources = [
     "TestInetCommon.cpp",
     "TestInetCommon.h",
     "TestInetCommonOptions.cpp",
     "TestInetCommonOptions.h",
-    "TestInetEndPoint.cpp",
-    "TestInetErrorStr.cpp",
     "TestInetLayer.cpp",
-    "TestInetLayer.h",
     "TestInetLayerCommon.cpp",
   ]
 
@@ -55,21 +57,12 @@ chip_test_suite("tests") {
     "${nlunit_test_root}:nlunit-test",
   ]
 
-  tests = [
-    "TestInetAddress",
-    "TestInetErrorStr",
-    "TestInetEndPoint",
-  ]
-
   # This fails on Raspberry Pi (Linux arm64), so only enable on Linux
   # x64.
   if (current_os != "mac" && chip_device_platform != "esp32" &&
       current_cpu == "x64") {
-    sources += [
-      "TestInetLayerDNS.cpp",
-      "TestLwIPDNS.cpp",
-    ]
-    tests += [ "TestInetLayerDNS" ]
+    test_sources += [ "TestInetLayerDNS.cpp" ]
+    sources += [ "TestLwIPDNS.cpp" ]
   }
 }
 

diff --git a/src/inet/tests/TestInetAddress.cpp b/src/inet/tests/TestInetAddress.cpp
@@ -24,8 +24,6 @@
  *
  */
 
-#include "TestInetLayer.h"
-
 #include <inet/IPAddress.h>
 
 #include <string.h>

diff --git a/src/inet/tests/TestInetAddressDriver.cpp b/src/inet/tests/TestInetAddressDriver.cpp
diff --git a/src/inet/tests/TestInetEndPoint.cpp b/src/inet/tests/TestInetEndPoint.cpp
@@ -28,8 +28,6 @@
 #define __STDC_LIMIT_MACROS
 #endif
 
-#include "TestInetLayer.h"
-
 #include <errno.h>
 #include <inttypes.h>
 #include <stdint.h>

diff --git a/src/inet/tests/TestInetEndPointDriver.cpp b/src/inet/tests/TestInetEndPointDriver.cpp
diff --git a/src/inet/tests/TestInetErrorStr.cpp b/src/inet/tests/TestInetErrorStr.cpp
@@ -32,8 +32,6 @@
 #define __STDC_LIMIT_MACROS
 #endif
 
-#include "TestInetLayer.h"
-
 #include <inttypes.h>
 #include <stdint.h>
 #include <string.h>

diff --git a/src/inet/tests/TestInetErrorStrDriver.cpp b/src/inet/tests/TestInetErrorStrDriver.cpp
diff --git a/src/inet/tests/TestInetLayerDNS.cpp b/src/inet/tests/TestInetLayerDNS.cpp
@@ -27,8 +27,6 @@
 #define __STDC_LIMIT_MACROS
 #endif
 
-#include "TestInetLayer.h"
-
 #include <inttypes.h>
 #include <stdint.h>
 #include <string.h>

diff --git a/src/inet/tests/TestInetLayerDNSDriver.cpp b/src/inet/tests/TestInetLayerDNSDriver.cpp
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,8 +24,6 @@ @@
      *
      */
-    #include "TestInetLayer.h"
     #include <inet/IPAddress.h>
     #include <string.h>
@@ Expand Down @@