diff options
author | 2017-03-17 23:58:28 +0000 | |
---|---|---|
committer | 2017-03-20 11:43:11 +0000 | |
commit | 5e9d915de8c23f8a4aae4bc2bb2d70dde4f1e32c (patch) | |
tree | ac49a0d320f4044695923a0382e77150e4ef3042 /src/test/java | |
parent | a5aa916dc8c0e99c8fc91893246381f72b7066a9 (diff) |
Fix AndroidBinaryTest on Windows.
--
PiperOrigin-RevId: 150501599
MOS_MIGRATED_REVID=150501599
Diffstat (limited to 'src/test/java')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java index 0ee11007e0..b1570b2a71 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java @@ -32,6 +32,7 @@ import com.google.devtools.build.lib.actions.Action; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.actions.util.ActionsTestUtil; import com.google.devtools.build.lib.analysis.ConfiguredTarget; +import com.google.devtools.build.lib.analysis.FilesToRunProvider; import com.google.devtools.build.lib.analysis.actions.SpawnAction; import com.google.devtools.build.lib.cmdline.RepositoryName; import com.google.devtools.build.lib.collect.nestedset.NestedSet; @@ -877,9 +878,12 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { SpawnAction proguardAction = (SpawnAction) actionsTestUtil().getActionForArtifactEndingWith( getFilesToBuild(output), "_proguard.jar"); + Artifact jkrunchyExecutable = + getHostConfiguredTarget("//java/com/google/devtools/build/jkrunchy") + .getProvider(FilesToRunProvider.class) + .getExecutable(); assertEquals("ProGuard implementation was not correctly taken from the configuration", - getHostConfiguration().getBinDirectory(RepositoryName.MAIN).getExecPath() - .getRelative("java/com/google/devtools/build/jkrunchy/jkrunchy").toString(), + jkrunchyExecutable.getExecPathString(), proguardAction.getCommandFilename()); } |