aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/test/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibraryTest.java
diff options
context:
space:
mode:
authorGravatar cparsons <cparsons@google.com>2017-12-21 14:15:55 -0800
committerGravatar Copybara-Service <copybara-piper@google.com>2017-12-21 14:18:11 -0800
commitcc99efdc6bec68979334345175e18066249e78e8 (patch)
tree40f8542d728cd67b1a1b5b4d95685b2f205d8e27 /src/test/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibraryTest.java
parentc1f55e7d4cc31bd1dee5ba586f852353dfd04aa1 (diff)
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
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibraryTest.java')
-rw-r--r--src/test/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibraryTest.java10
1 files changed, 6 insertions, 4 deletions
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")));