diff options
| author |  Lukacs Berki <lberki@google.com> | 2016-06-21 15:49:34 +0000 |
|---|---|---|
| committer |  Philipp Wollermann <philwo@google.com> | 2016-06-22 10:45:09 +0000 |
| commit | 4a81538fa6ea546b5b762c477efec8070fa2d3d3 (patch) | |
| tree | 286e9c26bce83c110c335db5e11b621217fcf505 /src/test/java | |
| parent | 7136478d3ff9aebdae454c4a5c8257fbcab19c5a (diff) | |
Remove the "glibc" selector from CppConfiguration.
It's not used and it causes difficulties, since it's a function of the CROSSTOOL file, which we want not to affect configurations (eventually).
--
MOS_MIGRATED_REVID=125455664
Diffstat (limited to 'src/test/java')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/analysis/config/ConfigSettingTest.java | 4 |
1 files changed, 0 insertions, 4 deletions
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 3005c077be..9e93477c19 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 @@ -166,7 +166,6 @@ public class ConfigSettingTest extends BuildViewTestCase { public void testLateBoundOptionDefaults() throws Exception { String crosstoolCpuDefault = (String) getTargetConfiguration().getOptionValue("cpu"); String crosstoolCompilerDefault = (String) getTargetConfiguration().getOptionValue("compiler"); - String crosstoolLibcDefault = (String) getTargetConfiguration().getOptionValue("glibc"); scratch.file("test/BUILD", "config_setting(", @@ -174,7 +173,6 @@ public class ConfigSettingTest extends BuildViewTestCase { " values = {", " 'cpu': '" + crosstoolCpuDefault + "',", " 'compiler': '" + crosstoolCompilerDefault + "',", //'gcc-4.4.0',", - " 'glibc': '" + crosstoolLibcDefault + "',", //'2.3.2',", " })"); assertTrue(getConfigMatchingProvider("//test:match").matches()); @@ -182,8 +180,6 @@ public class ConfigSettingTest extends BuildViewTestCase { assertNotNull(crosstoolCpuDefault); assertNull(flagDefault("compiler")); assertNotNull(crosstoolCompilerDefault); - assertNull(flagDefault("glibc")); - assertNotNull(crosstoolLibcDefault); } /** |