From cc99efdc6bec68979334345175e18066249e78e8 Mon Sep 17 00:00:00 2001 From: cparsons Date: Thu, 21 Dec 2017 14:15:55 -0800 Subject: Change Mock xcrunwrapper dependency to accurately be a sh_binary instead of a file. This allows writing java tests for skylark rules which might need to depend on a sh_binary xcrunwrapper. RELNOTES: None. PiperOrigin-RevId: 179857352 --- .../devtools/build/lib/rules/objc/AppleStaticLibraryTest.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/test/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibraryTest.java') 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 8fe598b529..d4e455c3a2 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 @@ -156,11 +156,12 @@ public class AppleStaticLibraryTest extends ObjcRuleTestCase { configurationBin("x86_64", ConfigurationDistinguisher.APPLEBIN_IOS) + "x/x-fl.a"; assertThat(Artifact.toExecPaths(action.getInputs())) - .containsExactly(i386Lib, x8664Lib, MOCK_XCRUNWRAPPER_PATH); + .containsExactly(i386Lib, x8664Lib, MOCK_XCRUNWRAPPER_PATH, + MOCK_XCRUNWRAPPER_EXECUTABLE_PATH); assertThat(action.getArguments()) .containsExactly( - MOCK_XCRUNWRAPPER_PATH, + MOCK_XCRUNWRAPPER_EXECUTABLE_PATH, LIPO, "-create", i386Lib, @@ -247,10 +248,11 @@ public class AppleStaticLibraryTest extends ObjcRuleTestCase { + "x/x-fl.a"; assertThat(Artifact.toExecPaths(action.getInputs())) - .containsExactly(i386Bin, armv7kBin, MOCK_XCRUNWRAPPER_PATH); + .containsExactly(i386Bin, armv7kBin, MOCK_XCRUNWRAPPER_PATH, + MOCK_XCRUNWRAPPER_EXECUTABLE_PATH); assertContainsSublist(action.getArguments(), ImmutableList.of( - MOCK_XCRUNWRAPPER_PATH, LIPO, "-create")); + MOCK_XCRUNWRAPPER_EXECUTABLE_PATH, LIPO, "-create")); assertThat(action.getArguments()).containsAllOf(armv7kBin, i386Bin); assertContainsSublist(action.getArguments(), ImmutableList.of( "-o", execPathEndingWith(action.getOutputs(), "x_lipo.a"))); -- cgit v1.2.3