From 857cda2c45a5cc68c3fa398311c48c571a64915d Mon Sep 17 00:00:00 2001 From: Kristina Chodorow Date: Tue, 19 Apr 2016 13:55:24 +0000 Subject: Move the runfiles for external repositories to under the x.runfiles/ directory This also sets the Bazel workspace name to io_bazel_source. Fixes #848. Relevant to #1116, #1124, RELNOTES[INC]: All repositories are now directly under the x.runfiles directory in the runfiles tree (previously, external repositories were at x.runfiles/main-repo/external/other-repo. This simplifies handling remote repository runfiles considerably, but will break existing references to external repository runfiles. --- Furthermore, if a Bazel project does not provide a workspace name in the WORKSPACE file, Bazel will now default to using __main__ as the workspace name (instead of "", as previously). The repository's runfiles will appear under x.runfiles/__main__/. -- MOS_MIGRATED_REVID=120224534 --- .../com/google/devtools/build/lib/testutil/TestConstants.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'src/test/java/com/google/devtools/build/lib/testutil/TestConstants.java') diff --git a/src/test/java/com/google/devtools/build/lib/testutil/TestConstants.java b/src/test/java/com/google/devtools/build/lib/testutil/TestConstants.java index 6d4fb51bef..cab180b1a5 100644 --- a/src/test/java/com/google/devtools/build/lib/testutil/TestConstants.java +++ b/src/test/java/com/google/devtools/build/lib/testutil/TestConstants.java @@ -38,17 +38,12 @@ public class TestConstants { * Location in the bazel repo where embedded binaries come from. */ public static final ImmutableList EMBEDDED_SCRIPTS_PATHS = ImmutableList.of( - "src/main/tools"); - - /** - * Path within runfiles tree for finding everything else. - */ - public static final String RUNFILES_PREFIX = "DOES-NOT-WORK-YET"; + "io_bazel/src/main/tools"); /** * Default workspace name. */ - public static final String WORKSPACE_NAME = ""; + public static final String WORKSPACE_NAME = "__main__"; /** * Name of a class with an INSTANCE field of type AnalysisMock to be used for analysis tests. @@ -59,7 +54,7 @@ public class TestConstants { /** * Directory where we can find bazel's Java tests, relative to a test's runfiles directory. */ - public static final String JAVATESTS_ROOT = "src/test/java/"; + public static final String JAVATESTS_ROOT = "io_bazel/src/test/java/"; public static final String TEST_RULE_CLASS_PROVIDER = "com.google.devtools.build.lib.bazel.rules.BazelRuleClassProvider"; -- cgit v1.2.3