From 2536840e325d3c1da74fdced3f8bda18b4c7277a Mon Sep 17 00:00:00 2001
From: Jeff Feasel <jfeasel@csa-iot.org>
Date: Sun, 18 Aug 2024 23:09:28 +0000
Subject: [PATCH] Added chip_link_tests to test_driver/efr32/args.gni and
 removed special logic from chip_test_suite

---
 build/chip/chip_test_suite.gni | 7 ++-----
 src/test_driver/efr32/args.gni | 1 +
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/build/chip/chip_test_suite.gni b/build/chip/chip_test_suite.gni
index 00fcc180d5c156..07381948750fc5 100644
--- a/build/chip/chip_test_suite.gni
+++ b/build/chip/chip_test_suite.gni
@@ -49,15 +49,12 @@ declare_args() {
 #   ]
 # }
 
-# If args.gni has defined an executable name, then ensure pw_test is called for each test source even if chip_link_tests is false.
-pw_test_builds_executable = test_executable_output_name != ""
-
 #
 template("chip_test_suite") {
   _suite_name = target_name
 
   exclude_variables = [ "tests" ]
-  if (pw_test_builds_executable) {
+  if (chip_link_tests) {
     # Common library shouldn't have all the individual unit tests, only the common sources.
     exclude_variables += [ "test_sources" ]
   } else {
@@ -97,7 +94,7 @@ template("chip_test_suite") {
   }
 
   # Build a source_set or a flashable executable for each individual unit test source, which also includes the common files.
-  if (chip_link_tests || pw_test_builds_executable) {
+  if (chip_link_tests) {
     tests = []
 
     if (defined(invoker.test_sources)) {
diff --git a/src/test_driver/efr32/args.gni b/src/test_driver/efr32/args.gni
index d54ec142bb6ba1..cc1cc6f2bf3d35 100644
--- a/src/test_driver/efr32/args.gni
+++ b/src/test_driver/efr32/args.gni
@@ -23,6 +23,7 @@ silabs_sdk_target = get_label_info(":sdk", "label_no_toolchain")
 
 chip_enable_pw_rpc = true
 chip_build_tests = true
+chip_link_tests = true
 chip_enable_openthread = true
 chip_openthread_ftd = false  # use mtd as it is smaller.