diff options
author | 2017-09-01 21:54:49 +0200 | |
---|---|---|
committer | 2017-09-04 12:19:12 +0200 | |
commit | 9308a4f06379d3fdfebc5945e49ff2e0a68417fa (patch) | |
tree | f18bb01744c0f228a62518766c151a8898baeb70 /src/test/java/com/google/devtools | |
parent | 78e6d51cada8a165b6c9255b9148e91bc9e3f7f1 (diff) |
Automated rollback of commit 618a2bf3574015d1d341d59a34e4d0bf285ad5bf.
*** Reason for rollback ***
Broke several tests in nightly.
[]
*** Original change description ***
Rollforward #2 of "AppleBinary and AppleStaticLibrary no longer propagate unwrapped ObjcProvider", after changes made to apple bazel rules to be compatible.
RELNOTES: None.
PiperOrigin-RevId: 167312716
Diffstat (limited to 'src/test/java/com/google/devtools')
7 files changed, 12 insertions, 42 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/AppleBinaryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/AppleBinaryTest.java index e9085c8cec..2c4026e678 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/objc/AppleBinaryTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/objc/AppleBinaryTest.java @@ -1440,7 +1440,7 @@ public class AppleBinaryTest extends ObjcRuleTestCase { @Test public void testCustomModuleMap() throws Exception { - checkCustomModuleMap(RULE_TYPE, true); + checkCustomModuleMap(RULE_TYPE); } @Test diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibraryTest.java index ca89f67c94..d76970aa85 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibraryTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibraryTest.java @@ -149,9 +149,7 @@ public class AppleStaticLibraryTest extends ObjcRuleTestCase { " resources = [':avoid.png']", ")"); - ObjcProvider provider = getConfiguredTarget("//package:test") - .get(AppleStaticLibraryProvider.SKYLARK_CONSTRUCTOR) - .getDepsObjcProvider(); + ObjcProvider provider = providerForTarget("//package:test"); // Do not remove SDK_FRAMEWORK values in avoid_deps. assertThat(provider.get(ObjcProvider.SDK_FRAMEWORK)) .containsAllOf(new SdkFramework("AvoidSDK"), new SdkFramework("BaseSDK")); @@ -625,4 +623,4 @@ public class AppleStaticLibraryTest extends ObjcRuleTestCase { assertThat(Artifact.toRootRelativePaths(action.getInputs())).doesNotContain( "package/libavoidCcLib.a"); } -} +}
\ No newline at end of file diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/IosTestTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/IosTestTest.java index 6c31986a0a..7bb3872c31 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/objc/IosTestTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/objc/IosTestTest.java @@ -1167,22 +1167,7 @@ public class IosTestTest extends ObjcRuleTestCase { // Usually, an ios_test would depend on apple_binary through a skylark_ios_application in its // 'binary' attribute. Since we don't have skylark_ios_application here, we use the 'deps' // attribute instead. - scratch.file("skylarkstub/BUILD"); - scratch.file("skylarkstub/skylark_stub.bzl", - "def skylark_ios_application_stub_impl(ctx):", - " bin_provider = ctx.attr.binary[apple_common.AppleExecutableBinary]", - " return struct(objc=bin_provider.objc)", - "skylark_ios_application_stub = rule(", - " skylark_ios_application_stub_impl,", - // Both 'binary' and 'deps' are needed because ObjcProtoAspect is applied transitively - // along attribute 'deps' only. - " attrs = {'binary': attr.label(mandatory=True,", - " providers=[apple_common.AppleExecutableBinary])},", - " fragments = ['apple', 'objc'],", - ")"); - scratch.file("x/BUILD", - "load('//skylarkstub:skylark_stub.bzl', 'skylark_ios_application_stub')", "genrule(", " name = 'gen_hdrs',", " outs = ['generated.h'],", @@ -1194,10 +1179,6 @@ public class IosTestTest extends ObjcRuleTestCase { " platform_type = 'ios',", " hdrs = ['generated.h'],", ")", - "skylark_ios_application_stub(", - " name = 'stub_application',", - " binary = ':apple_bin',", - ")", "objc_binary(", " name = 'bin',", " srcs = ['bin.m'],", @@ -1211,7 +1192,7 @@ public class IosTestTest extends ObjcRuleTestCase { " srcs = ['test.m'],", " xctest = 1,", " xctest_app = ':testApp',", - " deps = [':stub_application']", + " deps = [':apple_bin']", ")"); CommandAction compileAction = compileAction("//x:test", "test.o"); // The genfiles root for child configurations must be present in the compile action so that 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 5e0984af26..4775e2df30 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 @@ -928,7 +928,7 @@ public class ObjcBinaryTest extends ObjcRuleTestCase { @Test public void testCustomModuleMap() throws Exception { - checkCustomModuleMap(RULE_TYPE, false); + checkCustomModuleMap(RULE_TYPE); } @Test 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 3f0afa9743..08b1d0b191 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 @@ -1564,7 +1564,7 @@ public class ObjcLibraryTest extends ObjcRuleTestCase { @Test public void testCustomModuleMap() throws Exception { - checkCustomModuleMap(RULE_TYPE, false); + checkCustomModuleMap(RULE_TYPE); } private boolean containsObjcFeature(String srcName) throws Exception { diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibraryTest.java index ca872738ca..043f21b8cb 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibraryTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibraryTest.java @@ -679,12 +679,12 @@ public class ObjcProtoLibraryTest extends ObjcRuleTestCase { @Test public void testModulemapCreatedForNonLinkingTargets() throws Exception { - checkOnlyLibModuleMapsArePresentForTarget("//package:opl_protobuf", false); + checkOnlyLibModuleMapsArePresentForTarget("//package:opl_protobuf"); } @Test public void testModulemapNotCreatedForLinkingTargets() throws Exception { - checkOnlyLibModuleMapsArePresentForTarget("//package:opl_binary", true); + checkOnlyLibModuleMapsArePresentForTarget("//package:opl_binary"); } @Test @@ -760,8 +760,7 @@ public class ObjcProtoLibraryTest extends ObjcRuleTestCase { return Joiner.on('\n').join(Ordering.natural().immutableSortedCopy(elements)); } - private void checkOnlyLibModuleMapsArePresentForTarget(String target, - boolean fromBinary) throws Exception { + private void checkOnlyLibModuleMapsArePresentForTarget(String target) throws Exception { Artifact libModuleMap = getGenfilesArtifact( "opl_protobuf.modulemaps/module.modulemap", @@ -771,11 +770,7 @@ public class ObjcProtoLibraryTest extends ObjcRuleTestCase { "protobuf_lib.modulemaps/module.modulemap", getConfiguredTarget("//objcproto:protobuf_lib")); - ObjcProvider provider = fromBinary - ? getConfiguredTarget(target) - .get(AppleExecutableBinaryProvider.SKYLARK_CONSTRUCTOR) - .getDepsObjcProvider() - : providerForTarget(target); + ObjcProvider provider = providerForTarget(target); assertThat(Artifact.toRootRelativePaths(provider.get(ObjcProvider.MODULE_MAP).toSet())) .containsExactlyElementsIn( Artifact.toRootRelativePaths(ImmutableSet.of(libModuleMap, protolibModuleMap))); diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java index c580b6fcd6..b48d242c6b 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java @@ -4892,7 +4892,7 @@ public abstract class ObjcRuleTestCase extends BuildViewTestCase { .isEqualTo("a.o"); } - protected void checkCustomModuleMap(RuleType ruleType, boolean fromBinary) throws Exception { + protected void checkCustomModuleMap(RuleType ruleType) throws Exception { useConfiguration("--experimental_objc_enable_module_maps"); ruleType.scratchTarget(scratch, "srcs", "['a.m']", "deps", "['//z:testModuleMap']"); scratch.file("x/a.m"); @@ -4920,11 +4920,7 @@ public abstract class ObjcRuleTestCase extends BuildViewTestCase { assertThat(Artifact.toExecPaths(provider.get(MODULE_MAP))) .containsExactly("y/module.modulemap"); - provider = fromBinary - ? getConfiguredTarget("//x:x") - .get(AppleExecutableBinaryProvider.SKYLARK_CONSTRUCTOR) - .getDepsObjcProvider() - : providerForTarget("//x:x"); + provider = providerForTarget("//x:x"); assertThat(Artifact.toExecPaths(provider.get(MODULE_MAP))).contains("y/module.modulemap"); } |