diff options
author | 2017-01-13 16:41:01 +0000 | |
---|---|---|
committer | 2017-01-16 13:42:34 +0000 | |
commit | c81b3cd473a4cbfd63c2ae91de95b27698457790 (patch) | |
tree | 98c3d1cdbaa93cbe7e78e1f3e0803232b47cc007 /src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java | |
parent | 8f5943ec8241490e6c66a9169c55800c9c6ce045 (diff) |
Remove TRANSITIVE_MODULE_MAPS feature logic. This was only meant to be used for
a transition and is completely unused by now.
--
PiperOrigin-RevId: 144446659
MOS_MIGRATED_REVID=144446659
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java index 355b2924bc..0765419165 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java @@ -693,54 +693,6 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase { } @Test - public void testCompileUsingHeaderModulesTransitivelyWithTranstiveModuleMaps() throws Exception { - AnalysisMock.get() - .ccSupport() - .setupCrosstool( - mockToolsConfig, - MockCcSupport.HEADER_MODULES_FEATURE_CONFIGURATION - + "feature { name: 'transitive_module_maps' }"); - useConfiguration("--cpu=k8", "--features=transitive_module_maps"); - setupPackagesForModuleTests(/*useHeaderModules=*/true); - - getConfiguredTarget("//nomodule:f"); - Artifact fObjectArtifact = getBinArtifact("_objs/f/nomodule/f.pic.o", "//nomodule:f"); - CppCompileAction fObjectAction = (CppCompileAction) getGeneratingAction(fObjectArtifact); - // Only the module map of f itself itself and the direct dependencies are needed. - assertThat(getNonSystemModuleMaps(fObjectAction.getInputs())).containsExactly( - getGenfilesArtifact("y.cppmap", "//nomodule:y"), - getGenfilesArtifact("z.cppmap", "//nomodule:z"), - getGenfilesArtifact("a.cppmap", "//nomodule:a"), - getGenfilesArtifact("f.cppmap", "//nomodule:f"), - getGenfilesArtifact("e.cppmap", "//nomodule:e")); - - getConfiguredTarget("//nomodule:c"); - Artifact cObjectArtifact = getBinArtifact("_objs/c/nomodule/c.pic.o", "//nomodule:c"); - CppCompileAction cObjectAction = (CppCompileAction) getGeneratingAction(cObjectArtifact); - assertThat(getNonSystemModuleMaps(cObjectAction.getInputs())).containsExactly( - getGenfilesArtifact("y.cppmap", "//nomodule:y"), - getGenfilesArtifact("z.cppmap", "//nomodule:z"), - getGenfilesArtifact("a.cppmap", "//nomodule:a"), - getGenfilesArtifact("b.cppmap", "//module:b"), - getGenfilesArtifact("c.cppmap", "//nomodule:e")); - assertThat(getHeaderModules(cObjectAction.getContext().getTransitiveModules(true))) - .containsExactly(getBinArtifact("_objs/b/module/b.pic.pcm", "//module:b")); - - getConfiguredTarget("//nomodule:d"); - Artifact dObjectArtifact = getBinArtifact("_objs/d/nomodule/d.pic.o", "//nomodule:d"); - CppCompileAction dObjectAction = (CppCompileAction) getGeneratingAction(dObjectArtifact); - assertThat(getNonSystemModuleMaps(dObjectAction.getInputs())).containsExactly( - getGenfilesArtifact("y.cppmap", "//nomodule:y"), - getGenfilesArtifact("z.cppmap", "//nomodule:z"), - getGenfilesArtifact("a.cppmap", "//nomodule:a"), - getGenfilesArtifact("b.cppmap", "//module:b"), - getGenfilesArtifact("c.cppmap", "//nomodule:c"), - getGenfilesArtifact("d.cppmap", "//nomodule:d")); - assertThat(getHeaderModules(dObjectAction.getContext().getTransitiveModules(true))) - .containsExactly(getBinArtifact("_objs/b/module/b.pic.pcm", "//module:b")); - } - - @Test public void testCompileUsingHeaderModulesTransitively() throws Exception { AnalysisMock.get() .ccSupport() |