Test suite's common lib now contains only sources, not test_sources and is dep'd by each pw_test

Author: feasel0

build/chip/chip_test_suite.gni

@@ -53,23 +53,17 @@ declare_args() {
 template("chip_test_suite") {
   _suite_name = target_name
 
-  # Ensures that the common library has sources containing both common
-  # and individual unit tests.
-  if (!defined(invoker.sources)) {
-    invoker.sources = []
-  }
   if (!defined(invoker.test_sources)) {
     invoker.test_sources = []
   }
-  invoker.sources += invoker.test_sources
 
   if (chip_build_test_static_libraries) {
     _target_type = "static_library"
   } else {
     _target_type = "source_set"
   }
   target(_target_type, "${_suite_name}.lib") {
-    forward_variables_from(invoker, "*", [ "tests" ])
+    forward_variables_from(invoker, "*", [ "tests", "test_sources", ])
 
     output_dir = "${root_out_dir}/lib"
 
@@ -108,10 +102,8 @@ template("chip_test_suite") {
                                "configs",
                              ])
 
-      # Link to the common library for this test suite.
-      if (chip_link_tests) {
-        public_deps += [ ":${_suite_name}.lib" ]
-      }
+      # Link to the common lib for this suite so we get its `sources`.
+      public_deps += [ ":${_suite_name}.lib" ]
 
       # Set variables that the platform executable may need.
       if (test_executable_output_name != "") {
@@ -135,11 +127,6 @@ template("chip_test_suite") {
     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) {