From 76a2bbcf5e20f42400a5dad47729553ce8514e66 Mon Sep 17 00:00:00 2001 From: Lukacs Berki Date: Mon, 22 Aug 2016 14:53:38 +0000 Subject: Remove support for thin archives. -- MOS_MIGRATED_REVID=130938527 --- .../devtools/build/lib/analysis/mock/MOCK_CROSSTOOL | 1 - .../lib/rules/cpp/CrosstoolConfigurationLoaderTest.java | 15 ++------------- 2 files changed, 2 insertions(+), 14 deletions(-) (limited to 'src/test/java/com/google') diff --git a/src/test/java/com/google/devtools/build/lib/analysis/mock/MOCK_CROSSTOOL b/src/test/java/com/google/devtools/build/lib/analysis/mock/MOCK_CROSSTOOL index 67e8dc80a0..f0cfb1f199 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/mock/MOCK_CROSSTOOL +++ b/src/test/java/com/google/devtools/build/lib/analysis/mock/MOCK_CROSSTOOL @@ -351,7 +351,6 @@ toolchain { supports_interface_shared_objects: false supports_normalizing_ar: false supports_start_end_lib: false - supports_thin_archives: false target_libc: "armeabi-v7a" target_cpu: "armeabi-v7a" target_system_name: "armeabi-v7a" 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 8955951245..a1bfaaf313 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 @@ -117,7 +117,6 @@ public class CrosstoolConfigurationLoaderTest extends AnalysisTestCase { + " tool_path { name: \"dwp\" path: \"path-to-dwp\" }" + optionalTool + " supports_gold_linker: true" - + " supports_thin_archives: true" + " supports_normalizing_ar: true" + " supports_incremental_linker: true" + " supports_fission: true" @@ -195,7 +194,6 @@ public class CrosstoolConfigurationLoaderTest extends AnalysisTestCase { assertEquals("abi-libc-version", toolchain.getAbiGlibcVersion()); assertTrue(toolchain.supportsGoldLinker()); - assertTrue(toolchain.supportsThinArchives()); assertFalse(toolchain.supportsStartEndLib()); assertFalse(toolchain.supportsInterfaceSharedObjects()); assertFalse(toolchain.supportsEmbeddedRuntimes()); @@ -228,8 +226,7 @@ public class CrosstoolConfigurationLoaderTest extends AnalysisTestCase { assertEquals(Arrays.asList("objcopy"), toolchain.getObjCopyOptionsForEmbedding()); assertEquals(Arrays.asList(), toolchain.getLdOptionsForEmbedding()); - assertEquals(Arrays.asList("rcsD"), toolchain.getArFlags(/*thinArchives=*/ false)); - assertEquals(Arrays.asList("rcsDT"), toolchain.getArFlags(/*thinArchives=*/ true)); + assertEquals(Arrays.asList("rcsD"), toolchain.getArFlags()); assertThat(toolchain.getAdditionalMakeVariables().entrySet()) .containsExactlyElementsIn( @@ -285,7 +282,6 @@ public class CrosstoolConfigurationLoaderTest extends AnalysisTestCase { + " tool_path { name: \"strip\" path: \"path/to/strip-A\" }\n" + " tool_path { name: \"dwp\" path: \"path/to/dwp\" }\n" + " supports_gold_linker: true\n" - + " supports_thin_archives: true\n" + " supports_start_end_lib: true\n" + " supports_normalizing_ar: true\n" + " supports_embedded_runtimes: true\n" @@ -305,7 +301,6 @@ public class CrosstoolConfigurationLoaderTest extends AnalysisTestCase { + " ld_embed_flag: \"ld-embed-flag-A-1\"\n" + " ld_embed_flag: \"ld-embed-flag-A-2\"\n" + " ar_flag : \"ar-flag-A\"\n" - + " ar_thin_archives_flag : \"ar-thin-archives-flag-A\"\n" + " compilation_mode_flags {\n" + " mode: FASTBUILD\n" + " compiler_flag: \"fastbuild-flag-A-1\"\n" @@ -375,7 +370,6 @@ public class CrosstoolConfigurationLoaderTest extends AnalysisTestCase { + " tool_path { name: \"strip\" path: \"path/to/strip-B\" }\n" + " tool_path { name: \"dwp\" path: \"path/to/dwp\" }\n" + " supports_gold_linker: true\n" - + " supports_thin_archives: true\n" + " supports_start_end_lib: true\n" + " supports_normalizing_ar: true\n" + " supports_embedded_runtimes: true\n" @@ -399,7 +393,6 @@ public class CrosstoolConfigurationLoaderTest extends AnalysisTestCase { + " ld_embed_flag: \"ld-embed-flag-B-1\"\n" + " ld_embed_flag: \"ld-embed-flag-B-2\"\n" + " ar_flag : \"ar-flag-B\"\n" - + " ar_thin_archives_flag : \"ar-thin-archives-flag-B\"\n" + " compilation_mode_flags {\n" + " mode: FASTBUILD\n" + " compiler_flag: \"fastbuild-flag-B-1\"\n" @@ -505,7 +498,6 @@ public class CrosstoolConfigurationLoaderTest extends AnalysisTestCase { assertEquals(getToolPath("path/to/objdump-A"), toolchainA.getToolPathFragment(Tool.OBJDUMP)); assertEquals(getToolPath("path/to/strip-A"), toolchainA.getToolPathFragment(Tool.STRIP)); assertTrue(toolchainA.supportsGoldLinker()); - assertTrue(toolchainA.supportsThinArchives()); assertTrue(toolchainA.supportsStartEndLib()); assertTrue(toolchainA.supportsEmbeddedRuntimes()); assertTrue(toolchainA.toolchainNeedsPic()); @@ -596,9 +588,7 @@ public class CrosstoolConfigurationLoaderTest extends AnalysisTestCase { assertEquals( Arrays.asList("ld-embed-flag-A-1", "ld-embed-flag-A-2"), toolchainA.getLdOptionsForEmbedding()); - assertEquals(Arrays.asList("ar-flag-A"), toolchainA.getArFlags(/*thinArchives=*/ false)); - assertEquals( - Arrays.asList("ar-thin-archives-flag-A"), toolchainA.getArFlags(/*thinArchives=*/ true)); + assertEquals(Arrays.asList("ar-flag-A"), toolchainA.getArFlags()); assertThat(toolchainA.getAdditionalMakeVariables().entrySet()) .containsExactlyElementsIn( @@ -635,7 +625,6 @@ public class CrosstoolConfigurationLoaderTest extends AnalysisTestCase { assertEquals("abi-libc-version-C", toolchainC.getAbiGlibcVersion()); // Don't bother with testing the list of tools again. assertFalse(toolchainC.supportsGoldLinker()); - assertFalse(toolchainC.supportsThinArchives()); assertFalse(toolchainC.supportsStartEndLib()); assertFalse(toolchainC.supportsInterfaceSharedObjects()); assertFalse(toolchainC.supportsEmbeddedRuntimes()); -- cgit v1.2.3