diff options
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/CC/test/EXPRESSIONS | 22 | ||||
| -rw-r--r-- | rules/CC/test/RULES | 3 | ||||
| -rw-r--r-- | rules/shell/test/EXPRESSIONS | 2 | ||||
| -rw-r--r-- | rules/shell/test/RULES | 17 |
4 files changed, 43 insertions, 1 deletions
diff --git a/rules/CC/test/EXPRESSIONS b/rules/CC/test/EXPRESSIONS index a10fc2b..fe4918e 100644 --- a/rules/CC/test/EXPRESSIONS +++ b/rules/CC/test/EXPRESSIONS @@ -54,6 +54,7 @@ , "host transition": ["transitions", "for host"] , "target properties": ["transitions", "target properties"] , "stage": ["./", "../..", "stage_singleton_field"] + , "list_provider": ["./", "../..", "field_list_provider"] } , "expression": { "type": "let*" @@ -276,6 +277,17 @@ } } ] + , [ "summary PATH" + , { "type": "join" + , "separator": ":" + , "$1": + { "type": "let*" + , "bindings": + [["fieldname", "shell-defaults"], ["provider", "PATH"]] + , "body": {"type": "CALL_EXPRESSION", "name": "list_provider"} + } + } + ] , [ "summary" , { "type": "ACTION" , "inputs": @@ -293,6 +305,16 @@ , "name": "TEST_SUMMARY_EXECUTION_PROPERTIES" , "default": {"type": "empty_map"} } + , "env": + { "type": "if" + , "cond": {"type": "var", "name": "summary PATH"} + , "then": + { "type": "singleton_map" + , "key": "PATH" + , "value": {"type": "var", "name": "summary PATH"} + } + , "else": {"type": "empty_map"} + } } ] , [ "artifacts" diff --git a/rules/CC/test/RULES b/rules/CC/test/RULES index 1dac31b..9f3313d 100644 --- a/rules/CC/test/RULES +++ b/rules/CC/test/RULES @@ -34,6 +34,7 @@ ] , "implicit": { "defaults": [["./", "..", "defaults"]] + , "shell-defaults": [["./", "../../shell", "defaults"]] , "runner": ["runner"] , "summarizer": [["./", "../../shell/test", "summarizer"]] } @@ -77,6 +78,8 @@ ] , "data": ["Any files the test binary needs access to when running"] , "defaults": ["The C/C++ toolchain to use"] + , "shell-defaults": + ["The shell toolchain to use PATH from for calling the summary action"] , "runner": [ "The test runner which starts the actual test binary after providing" , "the respective environment. The runner also takes care of capturing" diff --git a/rules/shell/test/EXPRESSIONS b/rules/shell/test/EXPRESSIONS index f0966f7..635a407 100644 --- a/rules/shell/test/EXPRESSIONS +++ b/rules/shell/test/EXPRESSIONS @@ -275,7 +275,7 @@ } , "then": {"type": "empty_map"} , "else": - { "type": "singelton_map" + { "type": "singleton_map" , "key": "TEST_RUN_NUMBER" , "value": {"type": "var", "name": "ATTEMPT"} } diff --git a/rules/shell/test/RULES b/rules/shell/test/RULES index 4b72d10..91b7637 100644 --- a/rules/shell/test/RULES +++ b/rules/shell/test/RULES @@ -114,6 +114,7 @@ , "stage": ["./", "../..", "stage_singleton_field"] , "host transition": ["transitions", "maybe for host"] , "target properties": ["transitions", "target properties"] + , "default-PATH": ["./", "../../CC", "default-PATH"] } , "config_transitions": { "deps": [{"type": "CALL_EXPRESSION", "name": "host transition"}] @@ -209,6 +210,12 @@ } } ] + , [ "summary PATH" + , { "type": "join" + , "separator": ":" + , "$1": {"type": "CALL_EXPRESSION", "name": "default-PATH"} + } + ] , [ "summary" , { "type": "ACTION" , "inputs": @@ -226,6 +233,16 @@ , "name": "TEST_SUMMARY_EXECUTION_PROPERTIES" , "default": {"type": "empty_map"} } + , "env": + { "type": "if" + , "cond": {"type": "var", "name": "summary PATH"} + , "then": + { "type": "singleton_map" + , "key": "PATH" + , "value": {"type": "var", "name": "summary PATH"} + } + , "else": {"type": "empty_map"} + } } ] , [ "artifacts" |