From 1719556f03d9318c8e0b7b99c386df7e342e92f4 Mon Sep 17 00:00:00 2001
From: Jeff Feasel <jfeasel@csa-iot.org>
Date: Sat, 27 Jul 2024 18:21:21 +0000
Subject: [PATCH] Same as previous commit.

---
 build/chip/chip_test_suite.gni | 49 ++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/build/chip/chip_test_suite.gni b/build/chip/chip_test_suite.gni
index 8db07eac287720..3f5d426c2ca6f2 100644
--- a/build/chip/chip_test_suite.gni
+++ b/build/chip/chip_test_suite.gni
@@ -146,11 +146,60 @@ template("chip_test_suite") {
     tests += [ _test_name ]
   }
 
+  # Deprecated usage (user-defined driver)
+  if (defined(invoker.tests)) {
+    foreach(_test, invoker.tests) {
+      _test_output_dir = "${root_out_dir}/tests"
+      if (defined(invoker.output_dir)) {
+        _test_output_dir = invoker.output_dir
+      }
+
+      pw_test(_test) {
+        # Forward certain varibles from the invoker.
+        forward_variables_from(invoker,
+                                [
+                                  "deps",
+                                  "public_deps",
+                                  "cflags",
+                                  "configs",
+                                ])
+
+        # Link to the common library for this test suite.
+        if (chip_link_tests) {
+          public_deps += [ ":${_suite_name}.lib" ]
+        }
+
+        # Set variables that the platform executable may need.
+        if (test_executable_output_name != "") {
+          output_name = test_executable_output_name + _test_name + test_executable_output_name_suffix
+        }
+        ldflags = test_executable_ldflags
+
+        # Add the individual test source file (e.g. "TestSomething.cpp") and its driver.
+        sources = [
+          "${_test}.cpp",
+          "${_test}Driver.cpp",
+        ]
+
+        test_main = ""
+        output_dir = _test_output_dir
+      }
+      tests += [ _test ]
+    }
+  }
+
   group(_suite_name) {
     deps = []
+
+    # Add each individual unit test.
     foreach(_test, tests) {
       deps += [ ":${_test}" ]
     }
+
+    # Add the common library if none of the above tests did.
+    if (!chip_link_tests) {
+      deps += [ ":${_suite_name}.lib" ]
+    }
   }
 
   if (chip_pw_run_tests) {