diff options
| author | Klaus Aehlig <klaus.aehlig@huawei.com> | 2023-04-24 14:50:47 +0200 |
|---|---|---|
| committer | Klaus Aehlig <klaus.aehlig@huawei.com> | 2023-04-24 16:10:14 +0200 |
| commit | 5e8566cc3f10ec2108f9ef0f6fd2dee4f39d5051 (patch) | |
| tree | 045ed55cfd04cc0c5d8076a5d6dd923c5fff184b /rules | |
| parent | 70dffcedcbe6c399038adafd7c8b8555a6bfda26 (diff) | |
| download | justbuild-5e8566cc3f10ec2108f9ef0f6fd2dee4f39d5051.tar.gz | |
["CC/test", "test"]: factor out test-input
In this way, the test action gets canonical, so adding RUNS_PER_TEST
support to this rule should be easily mergable into downstream rules.
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/CC/test/RULES | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/rules/CC/test/RULES b/rules/CC/test/RULES index 69035800..fc7b332f 100644 --- a/rules/CC/test/RULES +++ b/rules/CC/test/RULES @@ -271,22 +271,24 @@ [{"type": "var", "name": "stage"}, {"type": "var", "name": "name"}] } ] + , [ "test input" + , { "type": "map_union" + , "$1": + [ { "type": "to_subdir" + , "subdir": "work" + , "$1": {"type": "var", "name": "data"} + } + , {"type": "var", "name": "runner"} + , {"type": "var", "name": "test-args"} + , {"type": "var", "name": "test-launcher"} + , {"type": "var", "name": "staged test binary"} + ] + } + ] , [ "test-results" , { "type": "ACTION" , "outs": ["result", "stdout", "stderr", "time-start", "time-stop"] - , "inputs": - { "type": "map_union" - , "$1": - [ { "type": "to_subdir" - , "subdir": "work" - , "$1": {"type": "var", "name": "data"} - } - , {"type": "var", "name": "runner"} - , {"type": "var", "name": "test-args"} - , {"type": "var", "name": "test-launcher"} - , {"type": "var", "name": "staged test binary"} - ] - } + , "inputs": {"type": "var", "name": "test input"} , "cmd": ["./runner"] , "env": { "type": "var" |