diff options
| author |  cpeyser <cpeyser@google.com> | 2017-07-18 21:36:52 +0200 |
|---|---|---|
| committer |  Klaus Aehlig <aehlig@google.com> | 2017-07-19 10:22:03 +0200 |
| commit | 2e647eed66771d549aab53faeb04ddad5719849b (patch) | |
| tree | 6574314012c95c18ef77ee0c740e5ee04eb40db9 /src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java | |
| parent | b747b1b864bd87f6b24e596e90d126a47ebb243b (diff) | |
Turn on objc crosstool use in Bazel by default.
PiperOrigin-RevId: 162388184
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 | 13 |
1 files changed, 5 insertions, 8 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 6633fcc99a..5b7155528c 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 @@ -50,6 +50,7 @@ import com.google.devtools.build.lib.rules.apple.ApplePlatform; 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.objc.ObjcCommandLineOptions.ObjcCrosstoolMode; import com.google.devtools.build.lib.vfs.PathFragment; import com.google.devtools.common.options.OptionsParsingException; import java.util.Collections; @@ -135,15 +136,13 @@ public class ObjcLibraryTest extends ObjcRuleTestCase { @Test public void testObjcPlusPlusCompileDarwin() throws Exception { - useConfiguration( - "--crosstool_top=" + MockObjcSupport.DEFAULT_OSX_CROSSTOOL, + useConfiguration(ObjcCrosstoolMode.ALL, "--experimental_disable_go", "--cpu=darwin_x86_64", "--macos_minimum_os=9.10.11", // TODO(b/36126423): Darwin should imply macos, so the // following line should not be necessary. - "--apple_platform_type=macos", - "--experimental_objc_crosstool=all"); + "--apple_platform_type=macos"); createLibraryTargetWriter("//objc:lib") .setList("srcs", "a.mm") .write(); @@ -1549,9 +1548,8 @@ public class ObjcLibraryTest extends ObjcRuleTestCase { public void testSysrootArgSpecifiedWithGrteTopFlag() throws Exception { MockObjcSupport.setup(mockToolsConfig, "default_grte_top : '//x'"); useConfiguration( - "--crosstool_top=" + MockObjcSupport.DEFAULT_OSX_CROSSTOOL, + ObjcCrosstoolMode.ALL, "--experimental_disable_go", - "--experimental_objc_crosstool=all", "--cpu=ios_x86_64", "--ios_cpu=x86_64"); scratch.file( @@ -1582,9 +1580,8 @@ public class ObjcLibraryTest extends ObjcRuleTestCase { " }", "}"); useConfiguration( - "--crosstool_top=" + MockObjcSupport.DEFAULT_OSX_CROSSTOOL, + ObjcCrosstoolMode.ALL, "--experimental_disable_go", - "--experimental_objc_crosstool=all", "--cpu=ios_x86_64", "--ios_cpu=x86_64"); scratch.file( |