diff options
| author |  jfield <jfield@google.com> | 2017-04-17 18:24:53 +0200 |
|---|---|---|
| committer |  Klaus Aehlig <aehlig@google.com> | 2017-04-18 11:32:17 +0200 |
| commit | 36355da02cfbfd1ab8361309543a4f4a4f8f9c7a (patch) | |
| tree | a7daac4b87df2e12ec97bc04ce229e1d3a1d1cce /src/test | |
| parent | 70f5d58f0e3d581fbb2bbf821a21ef0b301e1f3c (diff) | |
Automated g4 rollback of commit e7c730ba64d1c34ac7049f4165a33dc1329d0019.
*** Reason for rollback ***
breaks tests
*** Original change description ***
Extract --sysroot flag from bazel and move it into crosstool
This is an encore of https://github.com/bazelbuild/bazel/commit/6127358c1799d8d83cebbd499edac89f869df41b .
RELNOTES: None.
PiperOrigin-RevId: 153351147
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoaderTest.java | 2 | ||||
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariablesTest.java | 16 |
2 files changed, 1 insertions, 17 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoaderTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoaderTest.java index cff877e2f0..30b5af1d95 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoaderTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoaderTest.java @@ -514,7 +514,7 @@ public class CrosstoolConfigurationLoaderTest extends AnalysisTestCase { "cxx-flag-A-1", "cxx-flag-A-2", "cxx-fastbuild-flag-A-1", "cxx-fastbuild-flag-A-2"), toolchainA.getCxxOptions(NO_FEATURES)); assertEquals( - Arrays.asList("unfiltered-flag-A-1", "unfiltered-flag-A-2"), + Arrays.asList("--sysroot=some", "unfiltered-flag-A-1", "unfiltered-flag-A-2"), toolchainA.getUnfilteredCompilerOptions(NO_FEATURES)); assertEquals( Arrays.asList( diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariablesTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariablesTest.java index bb2c774704..004347cdc9 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariablesTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariablesTest.java @@ -293,22 +293,6 @@ public class LinkBuildVariablesTest extends BuildViewTestCase { } @Test - public void testSysrootVariable() throws Exception { - AnalysisMock.get() - .ccSupport() - .setupCrosstool(mockToolsConfig, "builtin_sysroot: '/usr/local/custom-sysroot'"); - useConfiguration(); - - scratch.file("x/BUILD", "cc_binary(name = 'foo', srcs = ['a.cc'])"); - scratch.file("x/a.cc"); - - ConfiguredTarget testTarget = getConfiguredTarget("//x:foo"); - Variables testVariables = getLinkBuildVariables(testTarget, LinkTargetType.EXECUTABLE); - - assertThat(testVariables.isAvailable(CppRuleClasses.SYSROOT_VARIABLE)).isTrue(); - } - - @Test public void testIsUsingFissionVariable() throws Exception { scratch.file("x/BUILD", "cc_binary(name = 'foo', srcs = ['foo.cc'])"); |