Making TestInetLayer an executable tool

BUILD.gn

@@ -161,6 +161,7 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
         "${chip_root}/examples/shell/standalone:chip-shell",
         "${chip_root}/src/app/tests/integration:chip-im-initiator",
         "${chip_root}/src/app/tests/integration:chip-im-responder",
+        "${chip_root}/src/inet/tests:inet-layer-test-tool",
         "${chip_root}/src/lib/address_resolve:address-resolve-tool",
         "${chip_root}/src/messaging/tests/echo:chip-echo-requester",
         "${chip_root}/src/messaging/tests/echo:chip-echo-responder",

src/inet/tests/BUILD.gn

@@ -14,13 +14,18 @@
 
 import("//build_overrides/build.gni")
 import("//build_overrides/chip.gni")
+import("//build_overrides/nlfaultinjection.gni")
 import("//build_overrides/pigweed.gni")
 
-import("${chip_root}/build/chip/chip_test_suite.gni")
 import("${chip_root}/build/chip/tests.gni")
+import("${chip_root}/build/chip/tools.gni")
 import("${chip_root}/src/platform/device.gni")
 import("${chip_root}/src/system/system.gni")
 
+if (chip_build_tests) {
+  import("${chip_root}/build/chip/chip_test_suite.gni")
+}
+
 config("tests_config") {
   include_dirs = [ "." ]
 }
@@ -40,55 +45,61 @@ static_library("helpers") {
     "TestSetupSignallingPosix.cpp",
   ]
 
-  if (current_os != "mbed") {
-    sources += [ "TestInetLayer.cpp" ]
-  }
+  cflags = [ "-Wconversion" ]
+
+  public_deps = [
+    "${chip_root}/src/inet",
+    "${chip_root}/src/lib/core",
+    "${chip_root}/src/platform",
+    "${nlfaultinjection_root}:nlfaultinjection",
+  ]
 
   if (chip_with_nlfaultinjection) {
     sources += [
       "TestSetupFaultInjection.h",
       "TestSetupFaultInjectionPosix.cpp",
     ]
+    public_deps += [ "${nlfaultinjection_root}:nlfaultinjection" ]
   }
+}
 
-  cflags = [ "-Wconversion" ]
+if (chip_build_tests) {
+  chip_test_suite("tests") {
+    output_name = "libInetLayerTests"
 
-  public_deps = [
-    "${chip_root}/src/inet",
-    "${chip_root}/src/lib/core",
-    "${chip_root}/src/platform",
-  ]
+    public_configs = [ ":tests_config" ]
+
+    public_deps = [
+      ":helpers",
+      "${chip_root}/src/inet",
+      "${chip_root}/src/lib/core",
+    ]
+    test_sources = [
+      "TestBasicPacketFilters.cpp",
+      "TestInetAddress.cpp",
+      "TestInetErrorStr.cpp",
+    ]
+    sources = []
+
+    if (chip_system_config_use_sockets && current_os != "zephyr") {
+      test_sources += [ "TestInetEndPoint.cpp" ]
+    }
+
+    cflags = [ "-Wconversion" ]
+  }
 }
 
-chip_test_suite("tests") {
-  output_name = "libInetLayerTests"
+executable("inet-layer-test-tool") {
+  sources = [ "inet-layer-test-tool.cpp" ]
 
-  public_configs = [ ":tests_config" ]
+  cflags = [ "-Wconversion" ]
 
   public_deps = [
     ":helpers",
     "${chip_root}/src/inet",
     "${chip_root}/src/lib/core",
+    "${chip_root}/src/platform",
   ]
-  test_sources = [
-    "TestBasicPacketFilters.cpp",
-    "TestInetAddress.cpp",
-    "TestInetErrorStr.cpp",
-  ]
-  sources = []
-
-  if (chip_system_config_use_sockets && current_os != "zephyr") {
-    test_sources += [ "TestInetEndPoint.cpp" ]
-  }
 
-  # This fails on Raspberry Pi (Linux arm64), so only enable on Linux
-  # x64.
-  if (current_os != "mac" && current_os != "zephyr" &&
-      chip_device_platform != "esp32" && current_cpu == "x64" &&
-      chip_device_platform != "ameba") {
-    # TODO: This test does not seem executed
-    sources += [ "TestLwIPDNS.cpp" ]
-  }
-
-  cflags = [ "-Wconversion" ]
+  output_dir = root_out_dir
 }

src/inet/tests/TestInetLayerCommon.hpp

@@ -126,8 +126,8 @@ extern bool IsSender();
 extern bool IsTesting(const TestStatus & aTestStatus);
 extern bool WasSuccessful(const TestStatus & aTestStatus);
 
-extern chip::System::PacketBufferHandle MakeDataBuffer(uint16_t aDesiredLength, uint8_t aFirstValue);
-extern chip::System::PacketBufferHandle MakeDataBuffer(uint16_t aDesiredLength);
+extern chip::System::PacketBufferHandle MakeDataBuffer(size_t aDesiredLength, uint8_t aFirstValue);
+extern chip::System::PacketBufferHandle MakeDataBuffer(size_t aDesiredLength);
 extern chip::System::PacketBufferHandle MakeICMPv4DataBuffer(uint16_t aDesiredUserLength);
 extern chip::System::PacketBufferHandle MakeICMPv6DataBuffer(uint16_t aDesiredUserLength);