commit 57629ec57cf779b96849c46114a6d9864e31e827
author Joshua Seaton <joshuaseaton@google.com> Sun Jan 13 21:02:54 2019 -0800
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Mon Jan 14 17:46:56 2019 +0000
tree eb569633c945a19a3e5a3ee5106f49d294de51e1
parent c24e6969f68163b737847034257c355c821aa8b7

[test spec] Rebase linux/mac test paths with respect to root_build_dir

This cuts off the leading //.

Moreover, we fix a bug in test.gni in which the location was being
recorded with the target_name of the spec instead of that of the test
template.

Change-Id: I691134596f27d38a36dc355c8fa0ee5519ac68d2

test.gni

diff --git a/test.gni b/test.gni
index 08da507..ffd0f8c 100644
--- a/test.gni
+++ b/test.gni
@@ -12,7 +12,7 @@
   if (is_linux || is_mac) {
     test_spec("${target_name}_spec") {
       name = invoker.target_name
-      location = "$root_out_dir/$target_name"
+      location = "$root_out_dir/${invoker.target_name}"
     }
   }
 

testing/test_spec.gni

diff --git a/testing/test_spec.gni b/testing/test_spec.gni
index f012adc..96fd781 100644
--- a/testing/test_spec.gni
+++ b/testing/test_spec.gni
@@ -218,6 +218,10 @@
     test = {
       name = get_label_info(":${invoker.name}", "label_no_toolchain")
       location = invoker.location
+      if (is_linux || is_mac) {
+        # Trim leading //.
+        location = rebase_path(location, root_build_dir)
+      }
       os = current_os
       cpu = current_cpu
     }