diff options
| author |  cpeyser <cpeyser@google.com> | 2017-11-03 18:42:59 +0100 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2017-11-06 20:19:54 +0100 |
| commit | 2a41993d1c2967ee64e7e1c50955de1684f71d73 (patch) | |
| tree | 1e22c53f9ce0d5541f4665d58d6379ba0ede322c /src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java | |
| parent | 79fb46712975935a7517d8fdf6e0011b4b8df710 (diff) | |
Remove legacy implementation of objc compilation/archiving/linking.
PiperOrigin-RevId: 174481563
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java index 043b791cd2..67862bdf3c 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java @@ -56,7 +56,6 @@ import com.google.devtools.build.lib.rules.apple.AppleToolchain; import com.google.devtools.build.lib.rules.cpp.CppCompileAction; import com.google.devtools.build.lib.rules.cpp.CppModuleMapAction; import com.google.devtools.build.lib.rules.cpp.LinkerInput; -import com.google.devtools.build.lib.rules.objc.ObjcCommandLineOptions.ObjcCrosstoolMode; import com.google.devtools.build.lib.rules.objc.ObjcProvider.Key; import com.google.devtools.build.lib.vfs.PathFragment; import com.google.devtools.common.options.OptionsParsingException; @@ -140,7 +139,7 @@ public class ObjcLibraryTest extends ObjcRuleTestCase { @Test public void testObjcPlusPlusCompileDarwin() throws Exception { - useConfiguration(ObjcCrosstoolMode.ALL, + useConfiguration( "--cpu=darwin_x86_64", "--macos_minimum_os=9.10.11", // TODO(b/36126423): Darwin should imply macos, so the @@ -1755,9 +1754,7 @@ public class ObjcLibraryTest extends ObjcRuleTestCase { @Test public void testObjcProtoLibraryDoesNotCrash() throws Exception { - useConfiguration( - "--crosstool_top=" + MockObjcSupport.DEFAULT_OSX_CROSSTOOL, - "--experimental_objc_crosstool=all"); + useConfiguration("--crosstool_top=" + MockObjcSupport.DEFAULT_OSX_CROSSTOOL); scratch.file( "x/BUILD", "objc_library(", @@ -1779,9 +1776,7 @@ public class ObjcLibraryTest extends ObjcRuleTestCase { @Test public void testLegacyObjcProtoLibraryDoesNotCrash() throws Exception { - useConfiguration( - "--crosstool_top=" + MockObjcSupport.DEFAULT_OSX_CROSSTOOL, - "--experimental_objc_crosstool=all"); + useConfiguration("--crosstool_top=" + MockObjcSupport.DEFAULT_OSX_CROSSTOOL); scratch.file( "x/BUILD", "objc_library(", @@ -1802,9 +1797,7 @@ public class ObjcLibraryTest extends ObjcRuleTestCase { @Test public void testObjcImportDoesNotCrash() throws Exception { - useConfiguration( - "--crosstool_top=" + MockObjcSupport.DEFAULT_OSX_CROSSTOOL, - "--experimental_objc_crosstool=all"); + useConfiguration("--crosstool_top=" + MockObjcSupport.DEFAULT_OSX_CROSSTOOL); scratch.file( "x/BUILD", "objc_library(", @@ -1888,7 +1881,6 @@ public class ObjcLibraryTest extends ObjcRuleTestCase { public void testSysrootArgSpecifiedWithGrteTopFlag() throws Exception { MockObjcSupport.setup(mockToolsConfig, "default_grte_top : '//x'"); useConfiguration( - ObjcCrosstoolMode.ALL, "--cpu=ios_x86_64", "--ios_cpu=x86_64"); scratch.file( @@ -1919,7 +1911,6 @@ public class ObjcLibraryTest extends ObjcRuleTestCase { " }", "}"); useConfiguration( - ObjcCrosstoolMode.ALL, "--cpu=ios_x86_64", "--ios_cpu=x86_64"); scratch.file( |