Implement ctx.actions.do_nothing instead of ctx.empty_action
RELNOTES: None.
PiperOrigin-RevId: 160621674
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/AspectTest.java b/src/test/java/com/google/devtools/build/lib/analysis/AspectTest.java
index 5ea7fd8..a2bac61 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/AspectTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/AspectTest.java
@@ -582,7 +582,7 @@
scratch.file(
"x/extension.bzl",
"def _aspect_impl(target, ctx):",
- " ctx.empty_action(mnemonic='Mnemonic')",
+ " ctx.actions.do_nothing(mnemonic='Mnemonic')",
" return struct()",
"aspect1 = aspect(_aspect_impl, attr_aspects=['deps'])",
"aspect2 = aspect(_aspect_impl, attr_aspects=['extra_deps'])",
@@ -647,7 +647,7 @@
scratch.file(
"x/extension.bzl",
"def _aspect_impl(target, ctx):",
- " ctx.empty_action(mnemonic='Mnemonic')",
+ " ctx.actions.do_nothing(mnemonic='Mnemonic')",
" return struct()",
"aspect1 = aspect(_aspect_impl, attr_aspects=['deps'], attrs =",
" {'param': attr.string(values = ['a', 'b'])})",
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java b/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java
index cd2c949..1100ce4 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java
@@ -1294,7 +1294,7 @@
scratch.file(
"x/extension.bzl",
"def _aspect1_impl(target, ctx):",
- " ctx.empty_action(mnemonic='Mnemonic')",
+ " ctx.actions.do_nothing(mnemonic='Mnemonic')",
" return struct()",
"aspect1 = aspect(_aspect1_impl, attr_aspects=['deps'])",
"",
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 3333e6b..202bc66 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
@@ -1861,6 +1861,7 @@
"actions.declare_file('foo.txt', sibling = file)",
"actions.declare_directory('foo.txt')",
"actions.declare_directory('foo.txt', sibling = file)",
+ "actions.do_nothing(mnemonic = 'foo', inputs = [file])",
"check_placeholders('foo', [])",
"action(command = 'foo', outputs = [file])",
"file_action(file, 'foo')",
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 21f6e08..9677078 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
@@ -433,14 +433,14 @@
checkErrorContains(
ruleContext,
- "missing mandatory named-only argument 'mnemonic' while calling empty_action",
- "ruleContext.empty_action(inputs = ruleContext.files.srcs)");
+ "parameter 'mnemonic' has no default value, in method do_nothing(list inputs) of 'actions'",
+ "ruleContext.actions.do_nothing(inputs = ruleContext.files.srcs)");
}
private void checkEmptyAction(SkylarkRuleContext ruleContext, String namedArgs) throws Exception {
assertThat(
evalRuleContextCode(
- ruleContext, String.format("ruleContext.empty_action(%s)", namedArgs)))
+ ruleContext, String.format("ruleContext.actions.do_nothing(%s)", namedArgs)))
.isEqualTo(Runtime.NONE);
}
@@ -449,7 +449,7 @@
scratch.file(
"test/empty.bzl",
"def _impl(ctx):",
- " ctx.empty_action(",
+ " ctx.actions.do_nothing(",
" inputs = ctx.files.srcs,",
" mnemonic = 'EA',",
" )",
