aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/test/java/com/google/devtools/build/lib/skylark
diff options
context:
space:
mode:
authorGravatar Laszlo Csomor <laszlocsomor@google.com>2016-10-31 16:08:27 +0000
committerGravatar Laszlo Csomor <laszlocsomor@google.com>2016-10-31 16:42:22 +0000
commit775dc683615d466b565a195abc30b09d90320eb7 (patch)
treea11e79c3c730dd4a2c3450bdda4ff40e62724b10 /src/test/java/com/google/devtools/build/lib/skylark
parent2dd4c183294b46a2509aef395596d39a17b7536f (diff)
Windows: java_binary can be an action executable
This change introduces a new output of java_binary on Windows: %{name}.cmd, a Windows-compatible Java launcher script. This simply calls out to bash.exe passing the shell launcher we use on other platforms. This change allows java_binary to be the executable of a Skylark action or any SpawnAction. Fixes https://github.com/bazelbuild/bazel/issues/1925 RELNOTES[NEW]: Bazel on Windows: java_binary can now be a the executable of Skylark rule actions (ctx.action's executable argument) -- MOS_MIGRATED_REVID=137708331
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/skylark')
-rw-r--r--src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java
index 674aa40bdb..cdd543de67 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java
@@ -628,7 +628,7 @@ public class SkylarkRuleContextTest extends SkylarkTestCase {
public void testGetExecutablePrerequisite() throws Exception {
SkylarkRuleContext ruleContext = createRuleContext("//foo:androidlib");
Object result = evalRuleContextCode(ruleContext, "ruleContext.executable._jarjar_bin");
- assertEquals("jarjar_bin", ((Artifact) result).getFilename());
+ assertThat(((Artifact) result).getFilename()).matches("^jarjar_bin(\\.exe){0,1}$");
}
@Test
@@ -645,7 +645,7 @@ public class SkylarkRuleContextTest extends SkylarkTestCase {
(SpawnAction)
Iterables.getOnlyElement(
ruleContext.getRuleContext().getAnalysisEnvironment().getRegisteredActions());
- assertThat(action.getCommandFilename()).endsWith("/jarjar_bin");
+ assertThat(action.getCommandFilename()).matches("^.*/jarjar_bin(\\.exe){0,1}$");
}
@Test