diff options
| author |  Dmitry Lomov <dslomov@google.com> | 2017-02-17 14:48:48 +0000 |
|---|---|---|
| committer | Dmitry Lomov <dslomov@google.com> | 2017-02-17 14:57:32 +0000 |
| commit | e36a66cd6e35e5b4b276f2b6ce63e1c691bcb02c (patch) | |
| tree | 7d2b273bf2948aa350147a91da3a6b4ad0111e34 /tools/build_rules | |
| parent | 75639985d593f683ba13d2ceb38ec310662fb56b (diff) | |
Rollback of commit 4b73e972d909bcd533f2f9940f95a00b9b73bdde.
*** Reason for rollback ***
Broke tests on CI: http://ci.bazel.io/job/bazel-tests/570/
*** Original change description ***
Roll forward execroot change
RELNOTES[INC]: Previously, an external repository would be symlinked into the
execution root at execroot/local_repo/external/remote_repo. This changes it to
be at execroot/remote_repo. This may break genrules/Skylark actions that
hardcode execution root paths. If this causes breakages for you, ensure that
genrules are using $(location :target) to access files and Skylark rules are
using http://bazel.io/docs/skylark/lib/File.html's path, dirname, etc.
functions. Cust...
--
PiperOrigin-RevId: 147833177
MOS_MIGRATED_REVID=147833177
Diffstat (limited to 'tools/build_rules')
| -rw-r--r-- | tools/build_rules/test_rules.bzl | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/tools/build_rules/test_rules.bzl b/tools/build_rules/test_rules.bzl index d4ede3e81e..ef93d62d8d 100644 --- a/tools/build_rules/test_rules.bzl +++ b/tools/build_rules/test_rules.bzl @@ -188,11 +188,8 @@ def _rule_test_impl(ctx): prefix_parts = [] if rule_.label.workspace_root: - if rule_.label.workspace_root.startswith(".."): - prefix_parts = [rule_.label.workspace_root] - else: - # Create a prefix that is correctly relative to the output of this rule. - prefix_parts = ["..", strip_prefix("external/", rule_.label.workspace_root)] + # Create a prefix that is correctly relative to the output of this rule. + prefix_parts = ["..", strip_prefix("external/", rule_.label.workspace_root)] if rule_.label.package: prefix_parts.append(rule_.label.package) |