clean up unit tests inclusion

Author: mkardous-silabs

BUILD.gn

@@ -163,8 +163,11 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
     }
 
     if (chip_build_tests) {
-      deps += [ "//src:tests" ]
-      deps += [ "//examples:example_tests" ]
+      deps += [
+        "//examples:example_tests",
+        "//examples/platform/silabs/tests:silabs_example_platform_tests",
+        "//src:tests",
+      ]
 
       if (current_os == "android" && current_toolchain == default_toolchain) {
         deps += [ "${chip_root}/build/chip/java/tests:java_build_test" ]

examples/BUILD.gn

@@ -24,7 +24,7 @@ if (chip_build_tests) {
 
   chip_test_group("example_tests") {
     deps = []
-    tests = [ "${chip_root}/examples/platform/silabs/tests" ]
+    tests = []
 
     if (chip_device_platform == "linux" && current_os == "linux") {
       tests += [ "${chip_root}/examples/energy-management-app/energy-management-common/tests" ]

examples/platform/silabs/test-event-trigger/SilabsTestEventTriggerDelegate.h

@@ -18,11 +18,11 @@
 
 #pragma once
 
-#include <ProvisionStorage.h>
 #include <app/TestEventTriggerDelegate.h>
 #include <lib/core/CHIPError.h>
 #include <lib/support/CodeUtils.h>
 #include <lib/support/Span.h>
+#include <platform/silabs/provision/ProvisionedDataProvider.h>
 #include <stdint.h>
 
 namespace chip {

examples/platform/silabs/tests/BUILD.gn

@@ -15,25 +15,36 @@
 import("//build_overrides/build.gni")
 import("//build_overrides/chip.gni")
 import("//build_overrides/pigweed.gni")
+import("${chip_root}/build/chip/chip_test_group.gni")
 import("${chip_root}/build/chip/chip_test_suite.gni")
-config("unit-test-config") {
-  defines = [ "OTA_ENCRYPTION_ENABLE=1" ]
+
+declare_args() {
+  # Build argument to enable Silabs specific unit tests
+  sl_build_unit_tests = true
 }
 
-chip_test_suite("tests") {
-  output_name = "libSilabsExamplesPlatformTests"
+chip_test_group("silabs_example_platform_tests") {
+  tests = []
+
+  if (sl_build_unit_tests) {
+    tests += [ "${chip_root}/examples/platform/silabs/tests" ]
+  }
+}
 
-  test_sources = [ "TestSilabsTestEventTrigger.cpp" ]
+if (sl_build_unit_tests) {
+  chip_test_suite("silabs_example_tests") {
+    output_name = "libSilabsExamplesPlatformTests"
 
-  public_configs = [ ":unit-test-config" ]
+    test_sources = [ "TestSilabsTestEventTrigger.cpp" ]
 
-  public_deps = [
-    "${chip_root}/examples/platform/silabs/test-event-trigger:sources",
-    "${chip_root}/src/lib/core",
-    "${chip_root}/src/lib/core:string-builder-adapters",
-    "${chip_root}/src/lib/support",
-    "${chip_root}/src/lib/support:testing",
-  ]
+    public_deps = [
+      "${chip_root}/examples/platform/silabs/test-event-trigger:sources",
+      "${chip_root}/src/lib/core",
+      "${chip_root}/src/lib/core:string-builder-adapters",
+      "${chip_root}/src/lib/support",
+      "${chip_root}/src/lib/support:testing",
+    ]
 
-  cflags = [ "-Wconversion" ]
+    cflags = [ "-Wconversion" ]
+  }
 }