Apply some updates from Arkadiusz

project-chip · Oct 28, 2024 · a3b6e10 · a3b6e10
1 parent c755d57
commit a3b6e10
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/build/chip/chip_test_suite.gni b/build/chip/chip_test_suite.gni
@@ -14,6 +14,7 @@
 
 import("//build_overrides/build.gni")
 import("//build_overrides/chip.gni")
+import("//build_overrides/googletest.gni")
 import("//build_overrides/pigweed.gni")
 
 import("${chip_root}/build/chip/tests.gni")
@@ -120,6 +121,10 @@ template("chip_test_suite") {
           # Link to the common lib for this suite so we get its `sources`.
           public_deps += [ ":${_suite_name}.lib" ]
 
+          if (pw_unit_test_BACKEND == "$dir_pw_unit_test:googletest") {
+            test_main = "$dir_pigweed/third_party/googletest:gmock_main"
+          }
+
           # Set variables that the platform executable may need.
           if (test_executable_output_name != "") {
             output_name = test_executable_output_name + _test_name +

diff --git a/src/test_driver/tizen/.gn b/src/test_driver/tizen/.gn
@@ -31,7 +31,6 @@ default_args = {
   pw_log_BACKEND = "$dir_pw_log_basic"
 
   pw_unit_test_BACKEND = "$dir_pw_unit_test:googletest"
-  pw_unit_test_MAIN = "$dir_pigweed/third_party/googletest:gmock_main"
   dir_pw_third_party_googletest = "$dir_googletest"
 
   # TODO: Make sure only unit tests link against this