diff options
Diffstat (limited to 'src/test/java/com/google')
5 files changed, 24 insertions, 17 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/MockObjcSupport.java b/src/test/java/com/google/devtools/build/lib/packages/util/MockObjcSupport.java index 73f9e9b491..d42f6f720a 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/util/MockObjcSupport.java +++ b/src/test/java/com/google/devtools/build/lib/packages/util/MockObjcSupport.java @@ -97,12 +97,26 @@ public final class MockObjcSupport { String.format( " srcs = ['%s//objcproto:well_known_type.proto'],", TestConstants.TOOLS_REPOSITORY), ")", - "xcode_config(name = 'host_xcodes', default = ':version7_3_1')", + "xcode_config(name = 'host_xcodes',", + " default = ':version7_3_1',", + " versions = [':version7_3_1', 'version5_0', 'version7_3', 'version5_8'])", "xcode_version(", " name = 'version7_3_1',", " version = '" + DEFAULT_XCODE_VERSION + "',", " default_ios_sdk_version = \"" + DEFAULT_IOS_SDK_VERSION + "\",", ")", + "xcode_version(", + " name = 'version7_3',", + " version = '7.3',", + ")", + "xcode_version(", + " name = 'version5_0',", + " version = '5.0',", + ")", + "xcode_version(", + " name = 'version5_8',", + " version = '5.8',", + ")", "objc_library(name = 'dummy_lib', srcs = ['objc_dummy.mm'])"); // If the bazel tools repository is not in the workspace, also create a workspace tools/objc // package with a few lingering dependencies. diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/IosDeviceTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/IosDeviceTest.java index 273f51b497..a0a9f20c72 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/objc/IosDeviceTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/objc/IosDeviceTest.java @@ -68,7 +68,7 @@ public class IosDeviceTest extends BuildViewTestCase { scratch.file("test/BUILD", "xcode_version(name = 'my_xcode', version = '15.2')", "ios_device(name = 'foo', type = 'IPHONE_6', xcode = ':my_xcode')"); - useConfiguration("--xcode_version=2.1", "--ios_sdk_version=42.3"); + useConfiguration("--xcode_version=7.3", "--ios_sdk_version=42.3"); assertXcodeVersion("//test:foo", "15.2"); assertIosVersion("//test:foo", XcodeVersionProperties.DEFAULT_IOS_SDK_VERSION); @@ -79,7 +79,7 @@ public class IosDeviceTest extends BuildViewTestCase { scratch.file("test/BUILD", "xcode_version(name = 'my_xcode', version = '15.2', default_ios_sdk_version='17.8')", "ios_device(name = 'foo', type = 'IPHONE_6', xcode = ':my_xcode')"); - useConfiguration("--xcode_version=2.1", "--ios_sdk_version=42.3"); + useConfiguration("--xcode_version=7.3", "--ios_sdk_version=42.3"); assertXcodeVersion("//test:foo", "15.2"); assertIosVersion("//test:foo", "17.8"); @@ -90,7 +90,7 @@ public class IosDeviceTest extends BuildViewTestCase { scratch.file("test/BUILD", "xcode_version(name = 'my_xcode', version = '15.2', default_ios_sdk_version='17.8')", "ios_device(name = 'foo', type = 'IPHONE_6', ios_version='98.7', xcode = ':my_xcode')"); - useConfiguration("--xcode_version=2.1", "--ios_sdk_version=42.3"); + useConfiguration("--xcode_version=7.3", "--ios_sdk_version=42.3"); assertXcodeVersion("//test:foo", "15.2"); assertIosVersion("//test:foo", "98.7"); diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcBinaryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcBinaryTest.java index 4775e2df30..4a20b8e777 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcBinaryTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcBinaryTest.java @@ -115,8 +115,7 @@ public class ObjcBinaryTest extends ObjcRuleTestCase { * Tests that bitcode is disabled for simulator builds even if enabled by flag. */ public void testLinkActionsWithBitcode_simulator() throws Exception { - useConfiguration("--xcode_version=7.1", "--apple_bitcode=embedded", - "--ios_multi_cpus=x86_64"); + useConfiguration("--apple_bitcode=embedded", "--ios_multi_cpus=x86_64"); createBinaryTargetWriter("//objc:bin").setAndCreateFiles("srcs", "a.m").write(); CommandAction linkAction = linkAction("//objc:bin"); @@ -128,8 +127,7 @@ public class ObjcBinaryTest extends ObjcRuleTestCase { @Test public void testLinkActionsWithNoBitcode() throws Exception { - useConfiguration("--xcode_version=7.1", "--apple_bitcode=none", - "--ios_multi_cpus=arm64"); + useConfiguration("--apple_bitcode=none", "--ios_multi_cpus=arm64"); createBinaryTargetWriter("//objc:bin").setAndCreateFiles("srcs", "a.m").write(); CommandAction linkAction = linkAction("//objc:bin"); @@ -810,7 +808,7 @@ public class ObjcBinaryTest extends ObjcRuleTestCase { @Test public void testLinkActionsWithEmbeddedBitcode() throws Exception { - useConfiguration("--xcode_version=7.1", "--apple_bitcode=embedded", "--ios_multi_cpus=arm64"); + useConfiguration("--apple_bitcode=embedded", "--ios_multi_cpus=arm64"); createBinaryTargetWriter("//objc:bin").setAndCreateFiles("srcs", "a.m").write(); CommandAction linkAction = linkAction("//objc:bin"); @@ -823,8 +821,7 @@ public class ObjcBinaryTest extends ObjcRuleTestCase { @Test public void testLinkActionsWithEmbeddedBitcodeMarkers() throws Exception { - useConfiguration( - "--xcode_version=7.1", "--apple_bitcode=embedded_markers", "--ios_multi_cpus=arm64"); + useConfiguration("--apple_bitcode=embedded_markers", "--ios_multi_cpus=arm64"); createBinaryTargetWriter("//objc:bin").setAndCreateFiles("srcs", "a.m").write(); CommandAction linkAction = linkAction("//objc:bin"); 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 08b1d0b191..26033f41a7 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 @@ -600,7 +600,6 @@ public class ObjcLibraryTest extends ObjcRuleTestCase { @Test public void testCompilationActionsWithEmbeddedBitcode() throws Exception { useConfiguration( - "--xcode_version=7.1", "--ios_multi_cpus=arm64", "--apple_bitcode=embedded"); createLibraryTargetWriter("//objc:lib") @@ -616,7 +615,6 @@ public class ObjcLibraryTest extends ObjcRuleTestCase { @Test public void testCompilationActionsWithEmbeddedBitcodeMarkers() throws Exception { useConfiguration( - "--xcode_version=7.1", "--ios_multi_cpus=arm64", "--apple_bitcode=embedded_markers"); @@ -634,7 +632,6 @@ public class ObjcLibraryTest extends ObjcRuleTestCase { public void testCompilationActionsWithNoBitcode() throws Exception { useConfiguration( "--crosstool_top=" + MockObjcSupport.DEFAULT_OSX_CROSSTOOL, - "--xcode_version=7.1", "--ios_multi_cpus=arm64", "--apple_bitcode=none"); @@ -656,7 +653,6 @@ public class ObjcLibraryTest extends ObjcRuleTestCase { public void testCompilationActionsWithBitcode_simulator() throws Exception { useConfiguration( "--crosstool_top=" + MockObjcSupport.DEFAULT_OSX_CROSSTOOL, - "--xcode_version=7.1", "--ios_multi_cpus=x86_64", "--apple_bitcode=embedded"); diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcSkylarkTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcSkylarkTest.java index 11d36332da..a5453e5b51 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcSkylarkTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcSkylarkTest.java @@ -290,7 +290,7 @@ public class ObjcSkylarkTest extends ObjcRuleTestCase { " name='my_target',", ")"); - useConfiguration("--cpu=ios_i386", "--xcode_version=7.1"); + useConfiguration("--cpu=ios_i386", "--xcode_version=7.3"); ConfiguredTarget skylarkTarget = getConfiguredTarget("//examples/apple_skylark:my_target"); @@ -304,7 +304,7 @@ public class ObjcSkylarkTest extends ObjcRuleTestCase { assertThat(env).containsEntry("APPLE_SDK_PLATFORM", "iPhoneSimulator"); assertThat(env).containsEntry("APPLE_SDK_VERSION_OVERRIDE", "8.4"); assertThat(sdkVersion).isEqualTo("8.4"); - assertThat(skylarkTarget.get("xcode_version")).isEqualTo("7.1"); + assertThat(skylarkTarget.get("xcode_version")).isEqualTo("7.3"); assertThat(skylarkTarget.get("single_arch_platform")).isEqualTo("IOS_SIMULATOR"); assertThat(skylarkTarget.get("single_arch_cpu")).isEqualTo("i386"); assertThat(skylarkTarget.get("platform_type")).isEqualTo("ios"); |