Make tests mock @bazel_tools by using the directory name "embedded_tools"
This matches what we use in prod, and obviates the need for extra mocking setup for bzlmod as long as you point installDir at the correct mocked directory.
Also cleaned up some duplicated setup code in BuildViewTestCase and ConfigurationTestCase.
PiperOrigin-RevId: 387784879
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java b/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java
index 334bab3..b4e9957 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java
@@ -54,7 +54,7 @@
public List<String> getWorkspaceContents(MockToolsConfig config) {
String xcodeWorkspace = config.getPath("local_config_xcode_workspace").getPathString();
String protobufWorkspace = config.getPath("protobuf_workspace").getPathString();
- String bazelToolWorkspace = config.getPath("bazel_tools_workspace").getPathString();
+ String bazelToolWorkspace = config.getPath("embedded_tools").getPathString();
String bazelPlatformsWorkspace = config.getPath("platforms_workspace").getPathString();
String rulesJavaWorkspace = config.getPath("rules_java_workspace").getPathString();
String localConfigPlatformWorkspace =
@@ -101,18 +101,17 @@
config.overwrite("WORKSPACE", workspaceContents.toArray(new String[0]));
/** The rest of platforms is initialized in {@link MockPlatformSupport}. */
config.create("platforms_workspace/WORKSPACE", "workspace(name = 'platforms')");
- config.create("bazel_tools_workspace/WORKSPACE", "workspace(name = 'bazel_tools')");
+ config.create("embedded_tools/WORKSPACE", "workspace(name = 'bazel_tools')");
Runfiles runfiles = Runfiles.create();
for (String filename : Arrays.asList("tools/jdk/java_toolchain_alias.bzl")) {
java.nio.file.Path path = Paths.get(runfiles.rlocation("io_bazel/" + filename));
if (!Files.exists(path)) {
continue; // the io_bazel workspace root only exists for Bazel
}
- config.create(
- "bazel_tools_workspace/" + filename, MoreFiles.asCharSource(path, UTF_8).read());
+ config.create("embedded_tools/" + filename, MoreFiles.asCharSource(path, UTF_8).read());
}
config.create(
- "bazel_tools_workspace/tools/jdk/BUILD",
+ "embedded_tools/tools/jdk/BUILD",
"load(",
" ':java_toolchain_alias.bzl',",
" 'java_toolchain_alias',",
@@ -221,13 +220,13 @@
// Create the actual SDKs.
ImmutableList<String> androidBuildContents = createAndroidBuildContents();
config.create(
- "bazel_tools_workspace/tools/android/BUILD", androidBuildContents.toArray(new String[0]));
+ "embedded_tools/tools/android/BUILD", androidBuildContents.toArray(new String[0]));
config.create(
- "bazel_tools_workspace/tools/android/emulator/BUILD",
+ "embedded_tools/tools/android/emulator/BUILD",
Iterables.toArray(createToolsAndroidEmulatorContents(), String.class));
// Create a dummy toolchain to make toolchain resolution happy.
config.create(
- "bazel_tools_workspace/tools/android/dummy_sdk/BUILD",
+ "embedded_tools/tools/android/dummy_sdk/BUILD",
"package(default_visibility=['//visibility:public'])",
"toolchain(",
" name = 'dummy-sdk',",
@@ -263,11 +262,10 @@
" tags = ['__ANDROID_RULES_MIGRATION__'],",
")");
- config.create(
- "bazel_tools_workspace/tools/genrule/BUILD", "exports_files(['genrule-setup.sh'])");
+ config.create("embedded_tools/tools/genrule/BUILD", "exports_files(['genrule-setup.sh'])");
config.create(
- "bazel_tools_workspace/tools/test/BUILD",
+ "embedded_tools/tools/test/BUILD",
"filegroup(name = 'runtime', srcs = ['test-setup.sh', 'test-xml-generator.sh'])",
"filegroup(name = 'test_wrapper', srcs = ['test_wrapper_bin'])",
"filegroup(name = 'xml_writer', srcs = ['xml_writer_bin'])",
@@ -281,7 +279,7 @@
// Use an alias package group to allow for modification at the simpler path
config.create(
- "bazel_tools_workspace/tools/allowlists/config_feature_flag/BUILD",
+ "embedded_tools/tools/allowlists/config_feature_flag/BUILD",
"package_group(",
" name='config_feature_flag',",
" includes=['@//tools/allowlists/config_feature_flag'],",
@@ -296,25 +294,25 @@
"package_group(name='config_feature_flag', packages=['//...'])");
config.create(
- "bazel_tools_workspace/tools/zip/BUILD",
+ "embedded_tools/tools/zip/BUILD",
"package(default_visibility=['//visibility:public'])",
"exports_files(['precompile.py'])",
"cc_binary(name='zipper', srcs=['zip_main.cc'])",
"alias(name='unzip_fdo', actual=':zipper')");
config.create(
- "bazel_tools_workspace/tools/launcher/BUILD",
+ "embedded_tools/tools/launcher/BUILD",
"package(default_visibility=['//visibility:public'])",
"load('@bazel_tools//third_party/cc_rules/macros:defs.bzl', 'cc_binary')",
"cc_binary(name='launcher', srcs=['launcher_main.cc'])");
config.create(
- "bazel_tools_workspace/tools/def_parser/BUILD",
+ "embedded_tools/tools/def_parser/BUILD",
"package(default_visibility=['//visibility:public'])",
"filegroup(name='def_parser', srcs=['def_parser.exe'])");
config.create(
- "bazel_tools_workspace/objcproto/BUILD",
+ "embedded_tools/objcproto/BUILD",
"package(default_visibility=['//visibility:public'])",
"objc_library(",
" name = 'protobuf_lib',",
@@ -327,9 +325,9 @@
" name = 'well_known_type_proto',",
" srcs = ['well_known_type.proto'],",
")");
- config.create("bazel_tools_workspace/objcproto/empty.m");
- config.create("bazel_tools_workspace/objcproto/empty.cc");
- config.create("bazel_tools_workspace/objcproto/well_known_type.proto");
+ config.create("embedded_tools/objcproto/empty.m");
+ config.create("embedded_tools/objcproto/empty.cc");
+ config.create("embedded_tools/objcproto/well_known_type.proto");
config.create("rules_java_workspace/WORKSPACE", "workspace(name = 'rules_java')");
config.create("rules_java_workspace/java/BUILD");
@@ -480,26 +478,26 @@
@Override
public void setupMockToolsRepository(MockToolsConfig config) throws IOException {
- config.create("bazel_tools_workspace/WORKSPACE", "workspace(name = 'bazel_tools')");
- config.create("bazel_tools_workspace/tools/build_defs/repo/BUILD");
+ config.create("embedded_tools/WORKSPACE", "workspace(name = 'bazel_tools')");
+ config.create("embedded_tools/tools/build_defs/repo/BUILD");
config.create(
- "bazel_tools_workspace/tools/build_defs/repo/utils.bzl",
+ "embedded_tools/tools/build_defs/repo/utils.bzl",
"def maybe(repo_rule, name, **kwargs):",
" if name not in native.existing_rules():",
" repo_rule(name = name, **kwargs)");
config.create(
- "bazel_tools_workspace/tools/build_defs/repo/http.bzl",
+ "embedded_tools/tools/build_defs/repo/http.bzl",
"def http_archive(**kwargs):",
" pass",
"",
"def http_file(**kwargs):",
" pass");
config.create(
- "bazel_tools_workspace/tools/jdk/local_java_repository.bzl",
+ "embedded_tools/tools/jdk/local_java_repository.bzl",
"def local_java_repository(**kwargs):",
" pass");
config.create(
- "bazel_tools_workspace/tools/jdk/remote_java_repository.bzl",
+ "embedded_tools/tools/jdk/remote_java_repository.bzl",
"def remote_java_repository(**kwargs):",
" pass");
}
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
index 001ef15..104dd74 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
@@ -247,35 +247,14 @@
analysisMock = getAnalysisMock();
directories =
new BlazeDirectories(
- new ServerDirectories(outputBase, outputBase, outputBase),
+ new ServerDirectories(rootDirectory, outputBase, outputBase),
rootDirectory,
/* defaultSystemJavabase= */ null,
analysisMock.getProductName());
actionKeyContext = new ActionKeyContext();
mockToolsConfig = new MockToolsConfig(rootDirectory, false);
- mockToolsConfig.create("bazel_tools_workspace/WORKSPACE", "workspace(name = 'bazel_tools')");
- mockToolsConfig.create("bazel_tools_workspace/tools/build_defs/repo/BUILD");
- mockToolsConfig.create(
- "bazel_tools_workspace/tools/build_defs/repo/utils.bzl",
- "def maybe(repo_rule, name, **kwargs):",
- " if name not in native.existing_rules():",
- " repo_rule(name = name, **kwargs)");
- mockToolsConfig.create(
- "bazel_tools_workspace/tools/build_defs/repo/http.bzl",
- "def http_archive(**kwargs):",
- " pass",
- "",
- "def http_file(**kwargs):",
- " pass");
- mockToolsConfig.create(
- "bazel_tools_workspace/tools/jdk/local_java_repository.bzl",
- "def local_java_repository(**kwargs):",
- " pass");
- mockToolsConfig.create(
- "bazel_tools_workspace/tools/jdk/remote_java_repository.bzl",
- "def remote_java_repository(**kwargs):",
- " pass");
+ analysisMock.setupMockToolsRepository(mockToolsConfig);
initializeMockClient();
packageOptions = parsePackageOptions();
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java
index bac7456..b371a84 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java
@@ -102,35 +102,13 @@
final PackageFactory pkgFactory;
BlazeDirectories directories =
new BlazeDirectories(
- new ServerDirectories(outputBase, outputBase, outputBase),
+ new ServerDirectories(rootDirectory, outputBase, outputBase),
rootDirectory,
/* defaultSystemJavabase= */ null,
analysisMock.getProductName());
mockToolsConfig = new MockToolsConfig(rootDirectory);
- mockToolsConfig.create("bazel_tools_workspace/WORKSPACE", "workspace(name = 'bazel_tools')");
- mockToolsConfig.create("bazel_tools_workspace/tools/build_defs/repo/BUILD");
- mockToolsConfig.create(
- "bazel_tools_workspace/tools/build_defs/repo/utils.bzl",
- "def maybe(repo_rule, name, **kwargs):",
- " if name not in native.existing_rules():",
- " repo_rule(name = name, **kwargs)");
- mockToolsConfig.create(
- "bazel_tools_workspace/tools/build_defs/repo/http.bzl",
- "def http_archive(**kwargs):",
- " pass",
- "",
- "def http_file(**kwargs):",
- " pass");
- mockToolsConfig.create(
- "bazel_tools_workspace/tools/jdk/local_java_repository.bzl",
- "def local_java_repository(**kwargs):",
- " pass");
- mockToolsConfig.create(
- "bazel_tools_workspace/tools/jdk/remote_java_repository.bzl",
- "def remote_java_repository(**kwargs):",
- " pass");
-
+ analysisMock.setupMockToolsRepository(mockToolsConfig);
analysisMock.setupMockClient(mockToolsConfig);
analysisMock.setupMockWorkspaceFiles(directories.getEmbeddedBinariesRoot());
diff --git a/src/test/java/com/google/devtools/build/lib/bazel/rules/android/AndroidNdkRepositoryTest.java b/src/test/java/com/google/devtools/build/lib/bazel/rules/android/AndroidNdkRepositoryTest.java
index 079aaa8..c9eca6c 100644
--- a/src/test/java/com/google/devtools/build/lib/bazel/rules/android/AndroidNdkRepositoryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/bazel/rules/android/AndroidNdkRepositoryTest.java
@@ -71,6 +71,8 @@
// repositories in @bazel_tools and @platforms.
if (!TestConstants.PRODUCT_NAME.equals("bazel")) {
MockPlatformSupport.setup(mockToolsConfig);
+ // TODO(wyv): consider removing this test within Google.
+ mockToolsConfig.create("embedded_tools/WORKSPACE", "workspace(name = 'bazel_tools')");
}
BazelMockCcSupport.INSTANCE.setup(mockToolsConfig);
// Replace the default host cc toolchain with one that uses Bazel platform constraints.
@@ -78,14 +80,14 @@
mockToolsConfig,
CcToolchainConfig.builder()
.withToolchainTargetConstraints("@platforms//os:linux", "@platforms//cpu:x86_64"));
- scratch.overwriteFile("bazel_tools_workspace/tools/build_defs/cc/BUILD");
+ scratch.overwriteFile("embedded_tools/tools/build_defs/cc/BUILD");
scratch.overwriteFile(
- "bazel_tools_workspace/tools/build_defs/cc/action_names.bzl",
+ "embedded_tools/tools/build_defs/cc/action_names.bzl",
ResourceLoader.readFromResources(
TestConstants.RULES_CC_REPOSITORY_EXECROOT + "cc/action_names.bzl"));
scratch.overwriteFile(
- "bazel_tools_workspace/tools/cpp/cc_toolchain_config_lib.bzl",
+ "embedded_tools/tools/cpp/cc_toolchain_config_lib.bzl",
ResourceLoader.readFromResources(
TestConstants.RULES_CC_REPOSITORY_EXECROOT + "cc/cc_toolchain_config_lib.bzl"));
scratch.file("/ndk/source.properties", "Pkg.Desc = Android NDK", "Pkg.Revision = 13.1.3345770");
@@ -99,7 +101,7 @@
MockPlatformSupport.setup(
mockToolsConfig,
"@bazel_tools//platforms",
- "bazel_tools_workspace/platforms",
+ "embedded_tools/platforms",
"@platforms//",
"platforms_workspace");
}
@@ -116,7 +118,7 @@
@Test
public void testApiLevelHighestVersionDetection() throws Exception {
scratchPlatformsDirectories("arch-x86", 19, 20, 22, 24);
- String bazelToolsWorkspace = scratch.dir("bazel_tools_workspace").getPathString();
+ String bazelToolsWorkspace = scratch.dir("embedded_tools").getPathString();
FileSystemUtils.appendIsoLatin1(
scratch.resolve("WORKSPACE"),
"local_repository(name = 'bazel_tools', path = '" + bazelToolsWorkspace + "')",
@@ -141,7 +143,7 @@
@Test
public void testInvalidNdkReleaseTxt() throws Exception {
scratchPlatformsDirectories("arch-x86", 24);
- String bazelToolsWorkspace = scratch.dir("bazel_tools_workspace").getPathString();
+ String bazelToolsWorkspace = scratch.dir("embedded_tools").getPathString();
FileSystemUtils.appendIsoLatin1(
scratch.resolve("WORKSPACE"),
"local_repository(name = 'bazel_tools', path = '" + bazelToolsWorkspace + "')",
@@ -167,7 +169,7 @@
@Test
public void testInvalidNdkSourceProperties() throws Exception {
scratchPlatformsDirectories("arch-x86", 24);
- String bazelToolsWorkspace = scratch.dir("bazel_tools_workspace").getPathString();
+ String bazelToolsWorkspace = scratch.dir("embedded_tools").getPathString();
FileSystemUtils.appendIsoLatin1(
scratch.resolve("WORKSPACE"),
"local_repository(name = 'bazel_tools', path = '" + bazelToolsWorkspace + "')",
@@ -195,7 +197,7 @@
@Test
public void testUnsupportedNdkVersion() throws Exception {
scratchPlatformsDirectories("arch-x86", 24);
- String bazelToolsWorkspace = scratch.dir("bazel_tools_workspace").getPathString();
+ String bazelToolsWorkspace = scratch.dir("embedded_tools").getPathString();
FileSystemUtils.appendIsoLatin1(
scratch.resolve("WORKSPACE"),
"local_repository(name = 'bazel_tools', path = '" + bazelToolsWorkspace + "')",
@@ -223,7 +225,7 @@
scratchPlatformsDirectories("arch-x86", 19, 20, 22, 24);
scratch.file(String.format("/ndk/sources/android/cpufeatures/cpu-features.c"));
scratch.file(String.format("/ndk/sources/android/cpufeatures/cpu-features.h"));
- String bazelToolsWorkspace = scratch.dir("bazel_tools_workspace").getPathString();
+ String bazelToolsWorkspace = scratch.dir("embedded_tools").getPathString();
FileSystemUtils.appendIsoLatin1(
scratch.resolve("WORKSPACE"),
"local_repository(name = 'bazel_tools', path = '" + bazelToolsWorkspace + "')",
@@ -246,7 +248,7 @@
@Test
public void testMissingPlatformsDirectory() throws Exception {
- String bazelToolsWorkspace = scratch.dir("bazel_tools_workspace").getPathString();
+ String bazelToolsWorkspace = scratch.dir("embedded_tools").getPathString();
FileSystemUtils.appendIsoLatin1(
scratch.resolve("WORKSPACE"),
"local_repository(name = 'bazel_tools', path = '" + bazelToolsWorkspace + "')",
diff --git a/src/test/java/com/google/devtools/build/lib/bazel/rules/android/AndroidSdkRepositoryTest.java b/src/test/java/com/google/devtools/build/lib/bazel/rules/android/AndroidSdkRepositoryTest.java
index 65c7ce3..113b830 100644
--- a/src/test/java/com/google/devtools/build/lib/bazel/rules/android/AndroidSdkRepositoryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/bazel/rules/android/AndroidSdkRepositoryTest.java
@@ -56,7 +56,7 @@
@Before
public void setup() throws Exception {
scratch.file(
- "bazel_tools_workspace/tools/android/android_sdk_repository_template.bzl",
+ "embedded_tools/tools/android/android_sdk_repository_template.bzl",
ResourceLoader.readFromResources("tools/android/android_sdk_repository_template.bzl"));
scratch.appendFile("WORKSPACE", "local_config_platform(name='local_config_platform')");
}
@@ -110,7 +110,7 @@
scratchPlatformsDirectories(25);
scratchBuildToolsDirectories();
scratchExtrasLibrary("extras/google/m2repository", "com.google.android", "foo", "1.0.0", "aar");
- String bazelToolsWorkspace = scratch.dir("bazel_tools_workspace").getPathString();
+ String bazelToolsWorkspace = scratch.dir("embedded_tools").getPathString();
FileSystemUtils.appendIsoLatin1(
scratch.resolve("WORKSPACE"),
"local_repository(name = 'bazel_tools', path = '" + bazelToolsWorkspace + "')",
@@ -132,7 +132,7 @@
scratchPlatformsDirectories(25);
scratchBuildToolsDirectories();
scratchExtrasLibrary("extras/google/m2repository", "com.google.android", "foo", "1.0.0", "aar");
- String bazelToolsWorkspace = scratch.dir("bazel_tools_workspace").getPathString();
+ String bazelToolsWorkspace = scratch.dir("embedded_tools").getPathString();
FileSystemUtils.appendIsoLatin1(
scratch.resolve("WORKSPACE"),
"local_repository(name = 'bazel_tools', path = '" + bazelToolsWorkspace + "')",
@@ -154,7 +154,7 @@
scratchExtrasLibrary("extras/google/m2repository", "com.google.android", "a", "1.0.0", "jar");
scratchExtrasLibrary("extras/android/m2repository", "com.android.support", "b", "1.0.0", "aar");
scratchExtrasLibrary("extras/m2repository", "com.android.support", "c", "1.0.1", "aar");
- String bazelToolsWorkspace = scratch.dir("bazel_tools_workspace").getPathString();
+ String bazelToolsWorkspace = scratch.dir("embedded_tools").getPathString();
FileSystemUtils.appendIsoLatin1(
scratch.resolve("WORKSPACE"),
"local_repository(name = 'bazel_tools', path = '" + bazelToolsWorkspace + "')",
@@ -182,7 +182,7 @@
public void testSystemImageDirectoriesAreFound() throws Exception {
scratchPlatformsDirectories(25);
scratchBuildToolsDirectories();
- String bazelToolsWorkspace = scratch.dir("bazel_tools_workspace").getPathString();
+ String bazelToolsWorkspace = scratch.dir("embedded_tools").getPathString();
FileSystemUtils.appendIsoLatin1(
scratch.resolve("WORKSPACE"),
"local_repository(name = 'bazel_tools', path = '" + bazelToolsWorkspace + "')",
@@ -218,7 +218,7 @@
scratchPlatformsDirectories(25, 26);
scratchBuildToolsDirectories();
scratchSystemImagesDirectories("android-25/default/armeabi-v7a", "android-O/google_apis/x86");
- String bazelToolsWorkspace = scratch.dir("bazel_tools_workspace").getPathString();
+ String bazelToolsWorkspace = scratch.dir("embedded_tools").getPathString();
FileSystemUtils.appendIsoLatin1(
scratch.resolve("WORKSPACE"),
"local_repository(name = 'bazel_tools', path = '" + bazelToolsWorkspace + "')",
@@ -236,7 +236,7 @@
// Use large version numbers here so that we don't have to update this test as
// AndroidSdkRepositoryFunction.MIN_BUILD_TOOLS_REVISION increases.
scratchBuildToolsDirectories("400.0.1", "400.0.2", "400.0.3");
- String bazelToolsWorkspace = scratch.dir("bazel_tools_workspace").getPathString();
+ String bazelToolsWorkspace = scratch.dir("embedded_tools").getPathString();
FileSystemUtils.appendIsoLatin1(
scratch.resolve("WORKSPACE"),
"local_repository(name = 'bazel_tools', path = '" + bazelToolsWorkspace + "')",
@@ -259,7 +259,7 @@
// Use large version numbers here so that we don't have to update this test as
// AndroidSdkRepositoryFunction.MIN_BUILD_TOOLS_REVISION increases.
scratchBuildToolsDirectories("400.0.1", "400.0.2");
- String bazelToolsWorkspace = scratch.dir("bazel_tools_workspace").getPathString();
+ String bazelToolsWorkspace = scratch.dir("embedded_tools").getPathString();
FileSystemUtils.appendIsoLatin1(
scratch.resolve("WORKSPACE"),
"local_repository(name = 'bazel_tools', path = '" + bazelToolsWorkspace + "')",
@@ -280,7 +280,7 @@
public void testApiLevelHighestVersionDetection() throws Exception {
scratchPlatformsDirectories(24, 25, 23);
scratchBuildToolsDirectories();
- String bazelToolsWorkspace = scratch.dir("bazel_tools_workspace").getPathString();
+ String bazelToolsWorkspace = scratch.dir("embedded_tools").getPathString();
FileSystemUtils.appendIsoLatin1(
scratch.resolve("WORKSPACE"),
"local_repository(name = 'bazel_tools', path = '" + bazelToolsWorkspace + "')",
@@ -301,7 +301,7 @@
int[] apiLevels = {23, 24, 25};
scratchPlatformsDirectories(apiLevels);
scratchBuildToolsDirectories();
- String bazelToolsWorkspace = scratch.dir("bazel_tools_workspace").getPathString();
+ String bazelToolsWorkspace = scratch.dir("embedded_tools").getPathString();
FileSystemUtils.appendIsoLatin1(
scratch.resolve("WORKSPACE"),
"local_repository(name = 'bazel_tools', path = '" + bazelToolsWorkspace + "')",
@@ -325,7 +325,7 @@
public void testMissingApiLevel() throws Exception {
scratchPlatformsDirectories(24);
scratchBuildToolsDirectories();
- String bazelToolsWorkspace = scratch.dir("bazel_tools_workspace").getPathString();
+ String bazelToolsWorkspace = scratch.dir("embedded_tools").getPathString();
FileSystemUtils.appendIsoLatin1(
scratch.resolve("WORKSPACE"),
"local_repository(name = 'bazel_tools', path = '" + bazelToolsWorkspace + "')",
@@ -355,7 +355,7 @@
scratchPlatformsDirectories(24);
scratchBuildToolsDirectories();
scratch.file("/sdk/system-images/.DS_Store");
- String bazelToolsWorkspace = scratch.dir("bazel_tools_workspace").getPathString();
+ String bazelToolsWorkspace = scratch.dir("embedded_tools").getPathString();
FileSystemUtils.appendIsoLatin1(
scratch.resolve("WORKSPACE"),
"local_repository(name = 'bazel_tools', path = '" + bazelToolsWorkspace + "')",
@@ -371,7 +371,7 @@
@Test
public void testMissingPlatformsDirectory() throws Exception {
scratchBuildToolsDirectories();
- String bazelToolsWorkspace = scratch.dir("bazel_tools_workspace").getPathString();
+ String bazelToolsWorkspace = scratch.dir("embedded_tools").getPathString();
FileSystemUtils.appendIsoLatin1(
scratch.resolve("WORKSPACE"),
"local_repository(name = 'bazel_tools', path = '" + bazelToolsWorkspace + "')",
@@ -395,7 +395,7 @@
@Test
public void testMissingBuildToolsDirectory() throws Exception {
scratchPlatformsDirectories(24);
- String bazelToolsWorkspace = scratch.dir("bazel_tools_workspace").getPathString();
+ String bazelToolsWorkspace = scratch.dir("embedded_tools").getPathString();
FileSystemUtils.appendIsoLatin1(
scratch.resolve("WORKSPACE"),
"local_repository(name = 'bazel_tools', path = '" + bazelToolsWorkspace + "')",
diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/BazelMockCcSupport.java b/src/test/java/com/google/devtools/build/lib/packages/util/BazelMockCcSupport.java
index ec5a99f..2a6a449 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/util/BazelMockCcSupport.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/util/BazelMockCcSupport.java
@@ -65,7 +65,7 @@
@Override
public String getMockCrosstoolPath() {
- return "bazel_tools_workspace/tools/cpp/";
+ return "embedded_tools/tools/cpp/";
}
@Override
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 1d8fb65..1b016c2 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
@@ -100,7 +100,7 @@
/** The workspace repository label under which built-in tools reside. */
public static final String TOOLS_REPOSITORY = "@bazel_tools";
/** The file path in which to create files so that they end up under {@link #TOOLS_REPOSITORY}. */
- public static final String TOOLS_REPOSITORY_SCRATCH = "bazel_tools_workspace/";
+ public static final String TOOLS_REPOSITORY_SCRATCH = "embedded_tools/";
/** The output file path prefix for tool file dependencies. */
public static final String TOOLS_REPOSITORY_PATH_PREFIX = "external/bazel_tools/";
@@ -139,7 +139,7 @@
public static final String PLATFORM_PACKAGE_ROOT = "@bazel_tools//platforms";
public static final String CONSTRAINTS_PACKAGE_ROOT = "@platforms//";
- public static final String PLATFORMS_PATH = "bazel_tools_workspace/platforms";
+ public static final String PLATFORMS_PATH = "embedded_tools/platforms";
public static final String CONSTRAINTS_PATH = "platforms_workspace";
public static final String LOCAL_CONFIG_PLATFORM_PATH = "local_config_platform_workspace";
