From 93fbc3e455d1a81abf6ba911550fc7954b1b7f68 Mon Sep 17 00:00:00 2001 From: Kristina Chodorow Date: Wed, 27 Apr 2016 17:03:28 +0000 Subject: Set Bazel's workspace name RELNOTES: Bazel's workspace name is now io_bazel. If you are using Bazel's source as an external repository, then you may want to update the name you're referring to it as or you'll begin seeing warnings about name mismatches in your code. -- MOS_MIGRATED_REVID=120926179 --- .../devtools/build/lib/analysis/RunfilesSupplierImplTest.java | 2 +- .../google/devtools/build/lib/packages/util/MockToolsConfig.java | 4 ++-- .../com/google/devtools/build/lib/testutil/TestConstants.java | 9 ++------- 3 files changed, 5 insertions(+), 10 deletions(-) (limited to 'src/test/java/com/google') diff --git a/src/test/java/com/google/devtools/build/lib/analysis/RunfilesSupplierImplTest.java b/src/test/java/com/google/devtools/build/lib/analysis/RunfilesSupplierImplTest.java index 8626f6913e..70024c460e 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/RunfilesSupplierImplTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/RunfilesSupplierImplTest.java @@ -86,7 +86,7 @@ public class RunfilesSupplierImplTest { } private static Runfiles mkRunfiles(Iterable artifacts) { - return new Runfiles.Builder("TESTING").addArtifacts(artifacts).build(); + return new Runfiles.Builder("TESTING", false).addArtifacts(artifacts).build(); } private static List mkArtifacts(Root rootDir, String... paths) { diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/MockToolsConfig.java b/src/test/java/com/google/devtools/build/lib/packages/util/MockToolsConfig.java index 6207fde742..8b57ff53dc 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/util/MockToolsConfig.java +++ b/src/test/java/com/google/devtools/build/lib/packages/util/MockToolsConfig.java @@ -123,12 +123,12 @@ public final class MockToolsConfig { */ public void linkTool(String relativePath, String dest) throws IOException { Preconditions.checkState(realFileSystem); - Path target = runfilesDirectory.getRelative(TestConstants.RUNFILES_PREFIX + "/" + relativePath); + Path target = runfilesDirectory.getRelative(TestConstants.WORKSPACE_NAME + "/" + relativePath); if (!target.exists()) { // In some cases we run tests in a special client with a ../READONLY/ path where we may also // find the runfiles. Try that, too. Path readOnlyClientPath = rootDirectory.getRelative( - "../READONLY/" + TestConstants.RUNFILES_PREFIX + "/" + relativePath); + "../READONLY/" + TestConstants.WORKSPACE_NAME + "/" + relativePath); if (!readOnlyClientPath.exists()) { throw new IOException("target does not exist " + target); } else { 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..a14172f55c 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,12 +38,7 @@ 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. @@ -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