From c74ee3784d3fd3a722f92c39805e57b4353a4509 Mon Sep 17 00:00:00 2001 From: Lukacs Berki Date: Mon, 12 Oct 2015 08:47:40 +0000 Subject: Make Bazel use tools that are embedded in its binary. This requires changing all "//tools/language:target" implicit dependencies to "@tools//tools/language:target". -- MOS_MIGRATED_REVID=105193805 --- .../google/devtools/build/lib/analysis/config/ConfigSettingTest.java | 4 +++- .../google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'src/test/java/com/google') diff --git a/src/test/java/com/google/devtools/build/lib/analysis/config/ConfigSettingTest.java b/src/test/java/com/google/devtools/build/lib/analysis/config/ConfigSettingTest.java index 4f2775dd1d..5cbe70305e 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/config/ConfigSettingTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/config/ConfigSettingTest.java @@ -13,6 +13,7 @@ // limitations under the License. package com.google.devtools.build.lib.analysis.config; +import com.google.devtools.build.lib.Constants; import com.google.devtools.build.lib.analysis.util.BuildViewTestCase; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.common.options.OptionsBase; @@ -203,8 +204,9 @@ public class ConfigSettingTest extends BuildViewTestCase { } public void testSelectForDefaultCrosstoolTop() throws Exception { + String crosstoolTop = Constants.TOOLS_REPOSITORY + "//tools/cpp:toolchain"; scratchConfiguredTarget("a", "a", - "config_setting(name='cs', values={'crosstool_top': '//tools/cpp:toolchain'})", + "config_setting(name='cs', values={'crosstool_top': '" + crosstoolTop + "'})", "sh_library(name='a', srcs=['a.sh'], deps=select({':cs': []}))"); } } 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 811ac6374a..0849ac1261 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 @@ -64,9 +64,11 @@ public class BazelAnalysisMock extends AnalysisMock { @Override public void setupMockClient(MockToolsConfig config) throws IOException { + String workspace = config.getPath("").getPathString(); ArrayList workspaceContents = new ArrayList<>( ImmutableList.of( + "local_repository(name = 'bazel_tools', path = '" + workspace + "')", "bind(", " name = 'objc_proto_lib',", " actual = '//objcproto:ProtocolBuffers_lib',", -- cgit v1.2.3