diff options
| author |  jmmv <jmmv@google.com> | 2017-03-30 20:25:48 +0000 |
|---|---|---|
| committer |  Philipp Wollermann <philwo@google.com> | 2017-03-31 17:11:12 +0200 |
| commit | 1520edbba81f3c61723be0ac792601d0299fa5f8 (patch) | |
| tree | 9c01a0512f5995cb771a8634042747e45aa9a545 /src/test/java | |
| parent | 833fd12fd86ddc32e89b1b0cff57b248a58dc8ab (diff) | |
Automated g4 rollback of commit 05300b5945286f6063afbf1d16c9c8e5621c4828.
*** Reason for rollback ***
Breaks inclusion of C++ system headers.
*** Original change description ***
Extract --sysroot flag from blaze and move it into crosstool
RELNOTES: None.
PiperOrigin-RevId: 151742077
Diffstat (limited to 'src/test/java')
| -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 bf59a7e62e..1fd7a011ad 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'])"); |