diff options
| author |  Googler <noreply@google.com> | 2017-03-20 18:01:06 +0000 |
|---|---|---|
| committer |  Yue Gan <yueg@google.com> | 2017-03-21 12:50:54 +0000 |
| commit | 4f472d2b44630fa38d82707f7e33f4aa5005d444 (patch) | |
| tree | 69f06e3fd7c7dc2f92e1248646d6217020bb4093 /src/test/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoaderTest.java | |
| parent | 59fec4e0823c11ab21fb3e81f8b65ada83f73e48 (diff) | |
RELNOTES[NEW]: If grte_top is a label, it can now follow non-configurable redirects.
--
PiperOrigin-RevId: 150647389
MOS_MIGRATED_REVID=150647389
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoaderTest.java')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoaderTest.java | 10 |
1 files changed, 8 insertions, 2 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 fce9586918..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 @@ -342,7 +342,7 @@ public class CrosstoolConfigurationLoaderTest extends AnalysisTestCase { + " builtin_sysroot: \"builtin-sysroot-A\"\n" + " default_python_top: \"python-top-A\"\n" + " default_python_version: \"python-version-A\"\n" - + " default_grte_top: \"//some:labelA\"" + + " default_grte_top: \"//some\"" + " debian_extra_requires: \"a\"" + " debian_extra_requires: \"b\"" + "}\n" @@ -446,7 +446,7 @@ public class CrosstoolConfigurationLoaderTest extends AnalysisTestCase { + " builtin_sysroot: \"builtin-sysroot-B\"\n" + " default_python_top: \"python-top-B\"\n" + " default_python_version: \"python-version-B\"\n" - + " default_grte_top: \"//some:labelB\"\n" + + " default_grte_top: \"//some\"\n" + " debian_extra_requires: \"c\"" + " debian_extra_requires: \"d\"" + "}\n" @@ -476,6 +476,12 @@ public class CrosstoolConfigurationLoaderTest extends AnalysisTestCase { + " tool_path { name: \"dwp\" path: \"path/to/dwp\" }\n" + "}"); + mockToolsConfig.create( + "some/BUILD", + "package(default_visibility=['//visibility:public'])", + "licenses(['unencumbered'])", + "filegroup(name = 'everything')"); + CppConfiguration toolchainA = create(loader, "--cpu=piii"); assertEquals("toolchain-identifier-A", toolchainA.getToolchainIdentifier()); assertEquals("host-system-name-A", toolchainA.getHostSystemName()); |