From 9f380c578d0cb9b846be5b906e99cd5e29e28446 Mon Sep 17 00:00:00 2001 From: pcloudy Date: Tue, 10 Jul 2018 07:41:53 -0700 Subject: Remove old implementation for object file path RELNOTES: --experimental_shortened_obj_file_path is removed. PiperOrigin-RevId: 203944948 --- .../rules/cpp/CcLibraryConfiguredTargetTest.java | 30 ++-------------------- 1 file changed, 2 insertions(+), 28 deletions(-) (limited to 'src/test/java/com/google/devtools/build/lib/rules/cpp') 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 0ceaee87c0..6b128f17fb 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 @@ -734,9 +734,9 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase { } @Test - public void testContainingSourcesWithSameBaseNameWithNewObjPath() throws Exception { + public void testContainingSourcesWithSameBaseName() throws Exception { AnalysisMock.get().ccSupport().setup(mockToolsConfig); - useConfiguration("--cpu=k8", "--experimental_shortened_obj_file_path=true"); + useConfiguration("--cpu=k8"); setupPackagesForSourcesWithSameBaseNameTests(); getConfiguredTarget("//foo:lib"); @@ -759,32 +759,6 @@ public class CcLibraryConfiguredTargetTest extends BuildViewTestCase { assertThat(getGeneratingAction(b).getInputs()).contains(getSourceArtifact("foo/subpkg1/b.cc")); } - @Test - public void testContainingSourcesWithSameBaseNameWithLegacyObjPath() throws Exception { - AnalysisMock.get().ccSupport().setup(mockToolsConfig); - useConfiguration("--cpu=k8", "--experimental_shortened_obj_file_path=false"); - setupPackagesForSourcesWithSameBaseNameTests(); - getConfiguredTarget("//foo:lib"); - - Artifact a0 = getBinArtifact("_objs/lib/foo/a.pic.o", getConfiguredTarget("//foo:lib")); - Artifact a1 = getBinArtifact("_objs/lib/foo/subpkg1/a.pic.o", getConfiguredTarget("//foo:lib")); - Artifact a2 = getBinArtifact("_objs/lib/bar/a.pic.o", getConfiguredTarget("//foo:lib")); - Artifact a3 = getBinArtifact("_objs/lib/foo/subpkg2/A.pic.o", getConfiguredTarget("//foo:lib")); - Artifact b = getBinArtifact("_objs/lib/foo/subpkg1/b.pic.o", getConfiguredTarget("//foo:lib")); - - assertThat(getGeneratingAction(a0)).isNotNull(); - assertThat(getGeneratingAction(a1)).isNotNull(); - assertThat(getGeneratingAction(a2)).isNotNull(); - assertThat(getGeneratingAction(a3)).isNotNull(); - assertThat(getGeneratingAction(b)).isNotNull(); - - assertThat(getGeneratingAction(a0).getInputs()).contains(getSourceArtifact("foo/a.cc")); - assertThat(getGeneratingAction(a1).getInputs()).contains(getSourceArtifact("foo/subpkg1/a.c")); - assertThat(getGeneratingAction(a2).getInputs()).contains(getSourceArtifact("bar/a.cpp")); - assertThat(getGeneratingAction(a3).getInputs()).contains(getSourceArtifact("foo/subpkg2/A.c")); - assertThat(getGeneratingAction(b).getInputs()).contains(getSourceArtifact("foo/subpkg1/b.cc")); - } - private void setupPackagesForModuleTests(boolean useHeaderModules) throws Exception { scratch.file("module/BUILD", "package(features = ['header_modules'])", -- cgit v1.2.3