Merge e799005 into 9533925

project-chip · Oct 18, 2024 · 2183890 · 2183890
2 parents 9533925 + e799005
commit 2183890
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 44 deletions.
diff --git a/src/BUILD.gn b/src/BUILD.gn
@@ -50,21 +50,25 @@ if (chip_build_tests) {
   chip_test_group("tests") {
     deps = []
     tests = [
+      "${chip_root}/src/access/tests",
       "${chip_root}/src/app/data-model/tests",
       "${chip_root}/src/app/cluster-building-blocks/tests",
       "${chip_root}/src/app/data-model-provider/tests",
-      "${chip_root}/src/access/tests",
+      "${chip_root}/src/app/icd/server/tests",
       "${chip_root}/src/crypto/tests",
       "${chip_root}/src/inet/tests",
       "${chip_root}/src/lib/address_resolve/tests",
       "${chip_root}/src/lib/asn1/tests",
       "${chip_root}/src/lib/core/tests",
+      "${chip_root}/src/lib/format/tests",
       "${chip_root}/src/messaging/tests",
       "${chip_root}/src/protocols/bdx/tests",
       "${chip_root}/src/protocols/interaction_model/tests",
+      "${chip_root}/src/protocols/secure_channel/tests",
       "${chip_root}/src/protocols/user_directed_commissioning/tests",
+      "${chip_root}/src/system/tests",
       "${chip_root}/src/transport/retransmit/tests",
-      "${chip_root}/src/app/icd/server/tests",
+      "${chip_root}/src/transport/tests",
     ]
 
     # Skip DNSSD tests for Mbed platform due to flash memory size limitations
@@ -81,8 +85,7 @@ if (chip_build_tests) {
       tests += [ "${chip_root}/src/lib/dnssd/minimal_mdns/records/tests" ]
     }
 
-    if (current_os != "zephyr" && current_os != "mbed" &&
-        chip_device_platform != "efr32") {
+    if (current_os != "zephyr" && current_os != "mbed") {
       # Avoid these items from "one single binary" test executions. Once tests
       # are split, we can re-visit this (and likely many others)
       #
@@ -97,30 +100,28 @@ if (chip_build_tests) {
       ]
     }
 
-    # Skip on efr32 due to flash and/or ram limitations.
+    # Disabled for EFR32 because _open is not implemented.
+    # https://github.com/project-chip/connectedhomeip/issues/35624
     if (chip_device_platform != "efr32") {
       tests += [
-        "${chip_root}/src/app/tests",
         "${chip_root}/src/credentials/tests",
-        "${chip_root}/src/lib/format/tests",
         "${chip_root}/src/lib/support/tests",
-        "${chip_root}/src/protocols/secure_channel/tests",
-        "${chip_root}/src/system/tests",
-        "${chip_root}/src/transport/tests",
+
+
+        "${chip_root}/src/app/tests",
       ]
+    }
 
-      if (matter_enable_tracing_support &&
-          matter_trace_config == "${chip_root}/src/tracing/multiplexed") {
-        tests += [ "${chip_root}/src/tracing/tests" ]
-      }
+    if (matter_enable_tracing_support &&
+        matter_trace_config == "${chip_root}/src/tracing/multiplexed") {
+      tests += [ "${chip_root}/src/tracing/tests" ]
     }
 
     if (chip_device_platform != "none") {
       tests += [ "${chip_root}/src/lib/dnssd/minimal_mdns/tests" ]
     }
 
-    if (chip_device_platform != "esp32" && chip_device_platform != "efr32" &&
-        chip_device_platform != "ameba") {
+    if (chip_device_platform != "esp32" && chip_device_platform != "ameba") {
       tests += [ "${chip_root}/src/platform/tests" ]
     }
 
@@ -130,9 +131,7 @@ if (chip_build_tests) {
 
     # On nrfconnect, the controller tests run into
     # https://github.com/project-chip/connectedhomeip/issues/9630
-    if (chip_device_platform != "nrfconnect" &&
-        chip_device_platform != "efr32") {
-      # Doesn't compile on ef32. Multiple definitions issues with attribute storage and overflows flash memory.
+    if (chip_device_platform != "nrfconnect") {
       tests += [ "${chip_root}/src/controller/tests/data_model" ]
 
       # Skip controller test for Open IoT SDK

diff --git a/src/controller/tests/BUILD.gn b/src/controller/tests/BUILD.gn
@@ -21,17 +21,27 @@ import("${chip_root}/build/chip/chip_test_suite.gni")
 chip_test_suite("tests") {
   output_name = "libControllerTests"
 
-  test_sources = [ "TestCommissionableNodeController.cpp" ]
-
-  if (chip_device_platform != "mbed" && chip_device_platform != "efr32" &&
-      chip_device_platform != "esp32") {
-    test_sources += [ "TestServerCommandDispatch.cpp" ]
-    test_sources += [ "TestEventChunking.cpp" ]
-    test_sources += [ "TestEventCaching.cpp" ]
-    test_sources += [ "TestReadChunking.cpp" ]
-    test_sources += [ "TestWriteChunking.cpp" ]
-    test_sources += [ "TestEventNumberCaching.cpp" ]
-    test_sources += [ "TestCommissioningWindowOpener.cpp" ]
+  test_sources = []
+
+  # Not supported on efr32.
+  if (chip_device_platform != "efr32") {
+    test_sources += [ "TestCommissionableNodeController.cpp" ]
+  }
+
+  if (chip_device_platform != "mbed" && chip_device_platform != "esp32") {
+    test_sources += [
+      "TestServerCommandDispatch.cpp",
+      "TestEventChunking.cpp",
+      "TestEventCaching.cpp",
+      "TestReadChunking.cpp",
+      "TestWriteChunking.cpp",
+      "TestEventNumberCaching.cpp",
+    ]
+
+    # Not supported on efr32.
+    if (chip_device_platform != "efr32") {
+      test_sources += [ "TestCommissioningWindowOpener.cpp" ]
+    }
   }
 
   cflags = [ "-Wconversion" ]

diff --git a/src/controller/tests/TestReadChunking.cpp b/src/controller/tests/TestReadChunking.cpp
@@ -582,7 +582,7 @@ TEST_F(TestReadChunking, TestListChunking)
     {
         TestReadCallback readCallback;
 
-        ChipLogDetail(DataManagement, "Running iteration %d\n", packetSize);
+        ChipLogDetail(DataManagement, "Running iteration %d\n", (int) packetSize);
 
         gIterationCount = packetSize;
 

diff --git a/src/controller/tests/TestWriteChunking.cpp b/src/controller/tests/TestWriteChunking.cpp
@@ -231,7 +231,7 @@ TEST_F(TestWriteChunking, TestListChunking)
         CHIP_ERROR err = CHIP_NO_ERROR;
         TestWriteCallback writeCallback;
 
-        ChipLogDetail(DataManagement, "Running iteration %d\n", i);
+        ChipLogDetail(DataManagement, "Running iteration %d\n", (int) i);
 
         gIterationCount = i;
 

diff --git a/src/controller/tests/data_model/BUILD.gn b/src/controller/tests/data_model/BUILD.gn
@@ -29,13 +29,17 @@ chip_test_suite("data_model") {
   ]
 
   test_sources = []
-  if (chip_device_platform != "mbed" && chip_device_platform != "efr32" &&
-      chip_device_platform != "esp32" && chip_device_platform != "fake") {
+  if (chip_device_platform != "mbed" && chip_device_platform != "esp32" &&
+      chip_device_platform != "fake") {
     test_sources += [
       "TestCommands.cpp",
-      "TestRead.cpp",
       "TestWrite.cpp",
     ]
+    if (chip_device_platform != "efr32") {
+      test_sources += [
+        "TestRead.cpp",
+      ]
+    }
   }
 
   public_deps = [

diff --git a/src/lib/core/tests/BUILD.gn b/src/lib/core/tests/BUILD.gn
@@ -31,14 +31,9 @@ chip_test_suite("tests") {
     "TestOptional.cpp",
     "TestReferenceCounted.cpp",
     "TestTLV.cpp",
+    #"TestTLVVectorWriter.cpp",
   ]
 
-  # requires large amount of heap for multiple unfragmented 10k buffers
-  # skip for efr32 to allow flash space for other tests
-  if (chip_device_platform != "efr32") {
-    test_sources += [ "TestTLVVectorWriter.cpp" ]
-  }
-
   cflags = [ "-Wconversion" ]
 
   public_deps = [

diff --git a/src/transport/tests/BUILD.gn b/src/transport/tests/BUILD.gn
@@ -44,9 +44,8 @@ chip_test_suite("tests") {
     "TestSessionManagerDispatch.cpp",
   ]
 
-  if (chip_device_platform != "mbed" && chip_device_platform != "efr32" &&
-      chip_device_platform != "esp32" && chip_device_platform != "nrfconnect" &&
-      chip_device_platform != "nxp") {
+  if (chip_device_platform != "mbed" && chip_device_platform != "esp32" &&
+      chip_device_platform != "nrfconnect" && chip_device_platform != "nxp") {
     test_sources += [ "TestSecureSessionTable.cpp" ]
   }