Index: testing/test.gni |
diff --git a/testing/test.gni b/testing/test.gni |
index b4cdbede08b9e3410b17930515260151be30433f..c648fc3791ff43a8663a8c1ec6637ded072c1089 100644 |
--- a/testing/test.gni |
+++ b/testing/test.gni |
@@ -75,9 +75,6 @@ template("test") { |
if (defined(invoker.direct_dependent_configs)) { |
direct_dependent_configs = invoker.direct_dependent_configs |
} |
- if (defined(invoker.forward_dependent_configs_from)) { |
- forward_dependent_configs_from = invoker.forward_dependent_configs_from |
- } |
if (defined(invoker.include_dirs)) { |
include_dirs = invoker.include_dirs |
} |
@@ -131,9 +128,25 @@ template("test") { |
} |
} |
+ test_name = main_target_name |
+ if (defined(invoker.output_name)) { |
+ test_name = invoker.output_name |
+ } |
+ test_runner_script_name = "${test_name}__test_runner_script" |
+ test_runner_script(test_runner_script_name) { |
+ test_name = test_name |
+ test_type = "gtest" |
+ test_suite = test_name |
+ if (defined(invoker.isolate_file)) { |
+ isolate_file = invoker.isolate_file |
+ } |
+ } |
+ |
group(target_name) { |
testonly = true |
- |
+ datadeps = [ |
+ ":$test_runner_script_name", |
+ ] |
deps = [ |
":$library_name", |
":$apk_name", |
@@ -199,9 +212,6 @@ template("test") { |
if (defined(invoker.direct_dependent_configs)) { |
direct_dependent_configs = invoker.direct_dependent_configs |
} |
- if (defined(invoker.forward_dependent_configs_from)) { |
- forward_dependent_configs_from = invoker.forward_dependent_configs_from |
- } |
if (defined(invoker.include_dirs)) { |
include_dirs = invoker.include_dirs |
} |