Removed define check of test_sources. Undid removal of chip_test.gni

build/chip/chip_test.gni

@@ -0,0 +1,71 @@
+# Copyright (c) 2020 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build_overrides/build.gni")
+import("//build_overrides/chip.gni")
+import("//build_overrides/pigweed.gni")
+
+import("$dir_pw_build/python_action.gni")
+
+import("${chip_root}/build/chip/tests.gni")
+import("${chip_root}/src/platform/device.gni")
+import("${dir_pw_unit_test}/test.gni")
+
+assert(chip_build_tests)
+
+if (chip_link_tests) {
+  template("chip_test") {
+    _test_name = target_name
+
+    _test_output_dir = "${root_out_dir}/tests"
+    if (defined(invoker.output_dir)) {
+      _test_output_dir = invoker.output_dir
+    }
+
+    executable(_test_name) {
+      forward_variables_from(invoker, "*", [ "output_dir" ])
+      output_dir = _test_output_dir
+    }
+
+    group(_test_name + ".lib") {
+    }
+
+    if (chip_pw_run_tests) {
+      pw_python_action(_test_name + ".run") {
+        deps = [ ":${_test_name}" ]
+        inputs = [ pw_unit_test_AUTOMATIC_RUNNER ]
+        module = "pw_unit_test.test_runner"
+        python_deps = [
+          "$dir_pw_cli/py",
+          "$dir_pw_unit_test/py",
+        ]
+        args = [
+          "--runner",
+          rebase_path(pw_unit_test_AUTOMATIC_RUNNER, root_build_dir),
+          "--test",
+          rebase_path("$_test_output_dir/$_test_name", root_build_dir),
+        ]
+        stamp = true
+      }
+    }
+  }
+} else {
+  template("chip_test") {
+    group(target_name) {
+    }
+    group(target_name + ".lib") {
+    }
+    not_needed(invoker, "*")
+  }
+}

build/chip/chip_test_suite.gni

@@ -16,6 +16,7 @@ import("//build_overrides/build.gni")
 import("//build_overrides/chip.gni")
 import("//build_overrides/pigweed.gni")
 
+import("${chip_root}/build/chip/chip_test.gni")
 import("${chip_root}/build/chip/tests.gni")
 import("${dir_pw_unit_test}/test.gni")
 
@@ -77,13 +78,9 @@ template("chip_test_suite") {
 
   # 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.sources += invoker.test_sources
-  }
+  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"
@@ -112,29 +109,27 @@ template("chip_test_suite") {
   if (chip_link_tests) {
     tests = []
 
-    if (defined(invoker.test_sources)) {
-      foreach(_test, invoker.test_sources) {
-        _test_name = string_replace(_test, ".cpp", "")
+    foreach(_test, invoker.test_sources) {
+      _test_name = string_replace(_test, ".cpp", "")
 
-        _test_output_dir = "${root_out_dir}/tests"
-        if (defined(invoker.output_dir)) {
-          _test_output_dir = invoker.output_dir
-        }
+      _test_output_dir = "${root_out_dir}/tests"
+      if (defined(invoker.output_dir)) {
+        _test_output_dir = invoker.output_dir
+      }
 
-        pw_test(_test_name) {
-          forward_variables_from(invoker,
-                                 [
-                                   "deps",
-                                   "public_deps",
-                                   "cflags",
-                                   "configs",
-                                 ])
-          public_deps += [ ":${_suite_name}.lib" ]
-          sources = [ _test ]
-          output_dir = _test_output_dir
-        }
-        tests += [ _test_name ]
+      pw_test(_test_name) {
+        forward_variables_from(invoker,
+                                [
+                                  "deps",
+                                  "public_deps",
+                                  "cflags",
+                                  "configs",
+                                ])
+        public_deps += [ ":${_suite_name}.lib" ]
+        sources = [ _test ]
+        output_dir = _test_output_dir
       }
+      tests += [ _test_name ]
     }
 
     if (defined(invoker.tests)) {
@@ -182,7 +177,7 @@ template("chip_test_suite") {
   } else {
 
     # Specified a platform executable type.
-    if (test_executable_output_name != "" && defined(invoker.test_sources)) {
+    if (test_executable_output_name != "") {
       tests = []
 
       foreach(_test, invoker.test_sources) {