From fc41c430e4de4594a1d699f573d191cbad52a2fb Mon Sep 17 00:00:00 2001 From: cpeyser Date: Wed, 30 Aug 2017 03:10:41 +0200 Subject: Move ObjcProvider FLAG into a new provider type (TransitiveSourcesProvider) that is accessible to the c++ rules. PiperOrigin-RevId: 166934390 --- .../build/lib/rules/objc/ObjcLibraryTest.java | 41 ---------------------- 1 file changed, 41 deletions(-) (limited to 'src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java') 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..056a607c39 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 @@ -1566,45 +1566,4 @@ public class ObjcLibraryTest extends ObjcRuleTestCase { public void testCustomModuleMap() throws Exception { checkCustomModuleMap(RULE_TYPE); } - - private boolean containsObjcFeature(String srcName) throws Exception { - MockObjcSupport.setup( - mockToolsConfig, - "feature {", - " name: 'contains_objc_sources'", - " flag_set {", - " flag_group {", - " flag: 'DUMMY_FLAG'", - " }", - " action: 'c++-compile'", - " }", - "}"); - createLibraryTargetWriter("//bottom:lib").setList("srcs", srcName).write(); - createLibraryTargetWriter("//middle:lib") - .setList("srcs", "b.cc") - .setList("deps", "//bottom:lib") - .write(); - createLibraryTargetWriter("//top:lib") - .setList("srcs", "a.cc") - .setList("deps", "//middle:lib") - .write(); - - CommandAction compileAction = compileAction("//top:lib", "a.o"); - return compileAction.getArguments().contains("DUMMY_FLAG"); - } - - @Test - public void testObjcSourcesFeatureCC() throws Exception { - assertThat(containsObjcFeature("c.cc")).isFalse(); - } - - @Test - public void testObjcSourcesFeatureObjc() throws Exception { - assertThat(containsObjcFeature("c.m")).isTrue(); - } - - @Test - public void testObjcSourcesFeatureObjcPlusPlus() throws Exception { - assertThat(containsObjcFeature("c.mm")).isTrue(); - } } -- cgit v1.2.3