aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar laurentlb <laurentlb@google.com>2017-07-31 15:53:07 +0200
committerGravatar Dmitry Lomov <dslomov@google.com>2017-07-31 16:32:20 +0200
commita4bfe16a12a0dbc72c3197d3ce0b3b6f8f1d8b87 (patch)
treeceb7620e57230dd40f34506ef6a57208c5620e9e
parenteb270a645f92e05dbee61b7fa0b6451a931a0cd2 (diff)
Rename 'executable' argument of 'ctx.actions.expand_template' to 'is_executable'.
This is for consistency with 'ctx.actions.write'. RELNOTES: None. PiperOrigin-RevId: 163687973
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/SkylarkActionFactory.java2
-rw-r--r--src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/SkylarkActionFactory.java b/src/main/java/com/google/devtools/build/lib/rules/SkylarkActionFactory.java
index 2f87704d83..2a3974179b 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/SkylarkActionFactory.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/SkylarkActionFactory.java
@@ -669,7 +669,7 @@ public class SkylarkActionFactory implements SkylarkValue {
doc = "substitutions to make when expanding the template."
),
@Param(
- name = "executable",
+ name = "is_executable",
type = Boolean.class,
defaultValue = "False",
named = true,
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java
index 6a7f2e278f..7ad63460e2 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java
@@ -633,7 +633,7 @@ public class SkylarkRuleImplementationFunctionsTest extends SkylarkTestCase {
" template = ruleContext.files.srcs[0],",
" output = ruleContext.files.srcs[1],",
" substitutions = {'a': 'b'},",
- " executable = False)");
+ " is_executable = False)");
TemplateExpansionAction action = (TemplateExpansionAction) Iterables.getOnlyElement(
ruleContext.getRuleContext().getAnalysisEnvironment().getRegisteredActions());
@@ -669,7 +669,7 @@ public class SkylarkRuleImplementationFunctionsTest extends SkylarkTestCase {
" template = ruleContext.files.srcs[0],",
" output = ruleContext.files.srcs[1],",
" substitutions = {'a': '" + new String(bytesToDecode, latin1) + "'},",
- " executable = False)");
+ " is_executable = False)");
TemplateExpansionAction action = (TemplateExpansionAction) Iterables.getOnlyElement(
ruleContext.getRuleContext().getAnalysisEnvironment().getRegisteredActions());
List<Substitution> substitutions = action.getSubstitutions();