diff options
author | 2017-07-03 07:15:31 -0400 | |
---|---|---|
committer | 2017-07-05 10:56:31 -0400 | |
commit | 40ddec31e4e45e69968f1b12af446342cb38f28a (patch) | |
tree | 94f1a88e4f31fa4bb302b0af47f431876eec5bfb /src/test/java/com/google/devtools/build/lib | |
parent | 71d1bbefcaa34c697db4166b7ba01970c15206a9 (diff) |
Migrate tests to ctx.actions.run/run_shell.
RELNOTES: None.
PiperOrigin-RevId: 160817326
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib')
7 files changed, 33 insertions, 29 deletions
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 1100ce4087..4098a2b02f 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 @@ -1305,7 +1305,7 @@ public class BuildViewTest extends BuildViewTestBase { "", "def _action_rule_impl(ctx):", " out = ctx.actions.declare_file(ctx.label.name)", - " ctx.action(outputs = [out], command = 'dontcare', mnemonic='Mnemonic')", + " ctx.actions.run_shell(outputs = [out], command = 'dontcare', mnemonic='Mnemonic')", " return struct()", "action_rule = rule(_action_rule_impl, attrs = { 'deps' : attr.label_list() })"); diff --git a/src/test/java/com/google/devtools/build/lib/analysis/actions/SpawnActionTest.java b/src/test/java/com/google/devtools/build/lib/analysis/actions/SpawnActionTest.java index 174e050bfb..127da84012 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/actions/SpawnActionTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/actions/SpawnActionTest.java @@ -494,7 +494,7 @@ public class SpawnActionTest extends BuildViewTestCase { "a/def.bzl", "def _aspect_impl(target, ctx):", " f = ctx.actions.declare_file('foo.txt')", - " ctx.action(outputs = [f], command = 'echo foo > \"$1\"')", + " ctx.actions.run_shell(outputs = [f], command = 'echo foo > \"$1\"')", " return struct(output=f)", "def _rule_impl(ctx):", " return struct(files=depset([artifact.output for artifact in ctx.attr.deps]))", diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkAspectsTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkAspectsTest.java index 6b86b8800c..3283693091 100644 --- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkAspectsTest.java +++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkAspectsTest.java @@ -1769,7 +1769,8 @@ public class SkylarkAspectsTest extends AnalysisTestCase { "test/aspect.bzl", "def _aspect_impl(target,ctx):", " f = ctx.actions.declare_file('dummy.txt')", - " ctx.action(outputs = [f], command='echo xxx > $(location f)', mnemonic='AspectAction')", + " ctx.actions.run_shell(outputs = [f], command='echo xxx > $(location f)',", + " mnemonic='AspectAction')", " return struct()", "my_aspect = aspect(implementation = _aspect_impl)" ); diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkIntegrationTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkIntegrationTest.java index 14842fc056..1f77337ff2 100644 --- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkIntegrationTest.java +++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkIntegrationTest.java @@ -733,7 +733,7 @@ public class SkylarkIntegrationTest extends BuildViewTestCase { "def custom_rule_impl(ctx):", " attr1 = ctx.files.attr1", " output = ctx.outputs.o", - " ctx.action(", + " ctx.actions.run_shell(", " inputs = attr1,", " outputs = [output],", " command = 'echo')", @@ -763,7 +763,7 @@ public class SkylarkIntegrationTest extends BuildViewTestCase { "test/skylark/extension.bzl", "def custom_rule_impl(ctx):", " files = [ctx.outputs.o]", - " ctx.action(", + " ctx.actions.run_shell(", " outputs = files,", " command = 'echo')", " ftb = depset(files)", @@ -798,7 +798,7 @@ public class SkylarkIntegrationTest extends BuildViewTestCase { "test/skylark/extension.bzl", "def custom_rule_impl(ctx):", " files = [ctx.outputs.o]", - " ctx.action(", + " ctx.actions.run_shell(", " outputs = files,", " command = 'echo')", " ftb = depset(files)", @@ -843,7 +843,7 @@ public class SkylarkIntegrationTest extends BuildViewTestCase { " files = [ctx.outputs.lbl, ctx.outputs.list, ctx.outputs.str]", " print('==!=!=!=')", " print(files)", - " ctx.action(", + " ctx.actions.run_shell(", " outputs = files,", " command = 'echo')", " return struct(files = depset(files))", @@ -887,7 +887,7 @@ public class SkylarkIntegrationTest extends BuildViewTestCase { scratch.file( "test/skylark/extension.bzl", "def custom_rule_impl(ctx):", - " ctx.action(", + " ctx.actions.run_shell(", " outputs = [ctx.outputs.o],", " command = 'echo')", " return struct(runfiles = ctx.runfiles())", @@ -962,7 +962,7 @@ public class SkylarkIntegrationTest extends BuildViewTestCase { "test/skylark/extension.bzl", "def custom_rule_impl(ctx):", " files = [ctx.outputs.o]", - " ctx.action(", + " ctx.actions.run_shell(", " outputs = files,", " command = 'echo')", " ftb = depset(files)", 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 f93a7e3181..eb0cee7a8c 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 @@ -648,7 +648,7 @@ public class SkylarkRuleContextTest extends SkylarkTestCase { SkylarkRuleContext ruleContext = createRuleContext("//foo:androidlib"); evalRuleContextCode( ruleContext, - "ruleContext.action(\n" + "ruleContext.actions.run(\n" + " inputs = ruleContext.files.srcs,\n" + " outputs = ruleContext.files.srcs,\n" + " arguments = ['--a','--b'],\n" @@ -1515,7 +1515,7 @@ public class SkylarkRuleContextTest extends SkylarkTestCase { public void testDependencyActionsProvider() throws Exception { scratch.file("test/rules.bzl", getSimpleUnderTestDefinition( - "ctx.action(outputs=[out], command='echo foo123 > ' + out.path)"), + "ctx.actions.run_shell(outputs=[out], command='echo foo123 > ' + out.path)"), testingRuleDefinition); scratch.file("test/BUILD", simpleBuildDefinition); @@ -1540,7 +1540,7 @@ public class SkylarkRuleContextTest extends SkylarkTestCase { reporter.removeHandler(failFastHandler); scratch.file("test/rules.bzl", getSimpleNontestableUnderTestDefinition( - "ctx.action(outputs=[out], command='echo foo123 > ' + out.path)"), + "ctx.actions.run_shell(outputs=[out], command='echo foo123 > ' + out.path)"), testingRuleDefinition); scratch.file("test/BUILD", simpleBuildDefinition); @@ -1562,7 +1562,8 @@ public class SkylarkRuleContextTest extends SkylarkTestCase { " out1 = ctx.outputs.out1", " out2 = ctx.outputs.out2", " ctx.actions.write(output=out1, content='foo123')", - " ctx.action(outputs=[out2], inputs=[out1], command='cp ' + out1.path + ' ' + out2.path)", + " ctx.actions.run_shell(outputs=[out2], inputs=[out1],", + " command='cp ' + out1.path + ' ' + out2.path)", " return struct(out1=out1, out2=out2)", "undertest_rule = rule(", " implementation = _undertest_impl,", @@ -1606,10 +1607,10 @@ public class SkylarkRuleContextTest extends SkylarkTestCase { "def _undertest_impl(ctx):", " out1 = ctx.outputs.out1", " out2 = ctx.outputs.out2", - " ctx.action(outputs=[out1], command='echo foo123 > ' + out1.path,", - " mnemonic='foo')", + " ctx.actions.run_shell(outputs=[out1], command='echo foo123 > ' + out1.path,", + " mnemonic='foo')", " v = ctx.created_actions().by_file", - " ctx.action(outputs=[out2], command='echo bar123 > ' + out2.path)", + " ctx.actions.run_shell(outputs=[out2], command='echo bar123 > ' + out2.path)", " return struct(v=v, out1=out1, out2=out2)", "undertest_rule = rule(", " implementation = _undertest_impl,", @@ -1640,7 +1641,7 @@ public class SkylarkRuleContextTest extends SkylarkTestCase { public void testNoAccessToCreatedActionsWithoutSkylarkTest() throws Exception { scratch.file("test/rules.bzl", getSimpleNontestableUnderTestDefinition( - "ctx.action(outputs=[out], command='echo foo123 > ' + out.path)") + "ctx.actions.run_shell(outputs=[out], command='echo foo123 > ' + out.path)") ); scratch.file("test/BUILD", "load(':rules.bzl', 'undertest_rule')", @@ -1657,7 +1658,7 @@ public class SkylarkRuleContextTest extends SkylarkTestCase { public void testSpawnActionInterface() throws Exception { scratch.file("test/rules.bzl", getSimpleUnderTestDefinition( - "ctx.action(outputs=[out], command='echo foo123 > ' + out.path)"), + "ctx.actions.run_shell(outputs=[out], command='echo foo123 > ' + out.path)"), testingRuleDefinition); scratch.file("test/BUILD", simpleBuildDefinition); 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 d908085b8b..c5de6c8ae4 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 @@ -264,7 +264,7 @@ public class SkylarkRuleImplementationFunctionsTest extends SkylarkTestCase { SkylarkRuleContext ruleContext = createRuleContext("//foo:foo"); evalRuleContextCode( ruleContext, - "ruleContext.action(", + "ruleContext.actions.run(", " inputs = ruleContext.files.srcs,", " outputs = ruleContext.files.srcs,", " arguments = ['--a','--b'],", @@ -284,7 +284,7 @@ public class SkylarkRuleImplementationFunctionsTest extends SkylarkTestCase { SkylarkRuleContext ruleContext = createRuleContext("//foo:foo"); evalRuleContextCode( ruleContext, - "ruleContext.action(", + "ruleContext.actions.run(", " inputs = depset(ruleContext.files.srcs),", " outputs = ruleContext.files.srcs,", " arguments = ['--a','--b'],", @@ -303,7 +303,7 @@ public class SkylarkRuleImplementationFunctionsTest extends SkylarkTestCase { checkErrorContains( createRuleContext("//foo:foo"), "expected file or PathFragment for executable but got string instead", - "ruleContext.action(", + "ruleContext.actions.run(", " inputs = ruleContext.files.srcs,", " outputs = ruleContext.files.srcs,", " arguments = ['--a','--b'],", @@ -315,7 +315,7 @@ public class SkylarkRuleImplementationFunctionsTest extends SkylarkTestCase { SkylarkRuleContext ruleContext = createRuleContext("//foo:foo"); evalRuleContextCode( ruleContext, - "ruleContext.action(", + "ruleContext.actions.run_shell(", " inputs = ruleContext.files.srcs,", " outputs = ruleContext.files.srcs,", " mnemonic = 'DummyMnemonic',", @@ -336,7 +336,7 @@ public class SkylarkRuleImplementationFunctionsTest extends SkylarkTestCase { evalRuleContextCode( ruleContext, "env = {'a' : 'b'}", - "ruleContext.action(", + "ruleContext.actions.run_shell(", " inputs = ruleContext.files.srcs,", " outputs = ruleContext.files.srcs,", " env = env,", @@ -357,8 +357,10 @@ public class SkylarkRuleImplementationFunctionsTest extends SkylarkTestCase { SkylarkRuleContext ruleContext = createRuleContext("//foo:foo"); checkErrorContains( ruleContext, - "unexpected keyword 'bad_param' in call to action(self: ctx, *, ", - "ruleContext.action(outputs=[], bad_param = 'some text')"); + "unexpected keyword 'bad_param', in method run(" + + "list outputs, string bad_param, File executable) of 'actions'", + "f = ruleContext.actions.declare_file('foo.sh')", + "ruleContext.actions.run(outputs=[], bad_param = 'some text', executable = f)"); } @Test @@ -373,7 +375,7 @@ public class SkylarkRuleImplementationFunctionsTest extends SkylarkTestCase { private Object createTestSpawnAction(SkylarkRuleContext ruleContext) throws Exception { return evalRuleContextCode( ruleContext, - "ruleContext.action(", + "ruleContext.actions.run_shell(", " inputs = ruleContext.files.srcs,", " outputs = ruleContext.files.srcs,", " arguments = ['--a','--b'],", @@ -389,7 +391,7 @@ public class SkylarkRuleImplementationFunctionsTest extends SkylarkTestCase { createRuleContext("//foo:foo"), "expected type 'File' for 'outputs' element but got type 'string' instead", "l = ['a', 'b']", - "ruleContext.action(", + "ruleContext.actions.run_shell(", " outputs = l,", " command = 'dummy_command')"); } @@ -399,7 +401,7 @@ public class SkylarkRuleImplementationFunctionsTest extends SkylarkTestCase { checkErrorContains( createRuleContext("//foo:foo"), "'command' list has to be of size at least 3", - "ruleContext.action(", + "ruleContext.actions.run_shell(", " outputs = ruleContext.files.srcs,", " command = ['dummy_command', '--arg'])"); } diff --git a/src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java b/src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java index 4a1d6a3e54..256985c686 100644 --- a/src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java +++ b/src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java @@ -771,7 +771,7 @@ public class SkylarkEvaluationTest extends EvaluationTest { .update("mock", new Mock()) .setUp("") .testIfExactError( - "too many arguments, in method with_params(int, bool, bool named, " + "unexpected keyword 'n', in method with_params(int, bool, bool named, " + "bool posOrNamed, int n) of 'Mock'", "mock.with_params(1, True, named=True, posOrNamed=True, n=2)"); new SkylarkTest() |