diff options
Diffstat (limited to 'CC/test')
| -rw-r--r-- | CC/test/EXPRESSIONS | 29 | ||||
| -rw-r--r-- | CC/test/RULES | 15 |
2 files changed, 44 insertions, 0 deletions
diff --git a/CC/test/EXPRESSIONS b/CC/test/EXPRESSIONS index 18028f8..1389bbc 100644 --- a/CC/test/EXPRESSIONS +++ b/CC/test/EXPRESSIONS @@ -48,12 +48,15 @@ , "compile-args-deps": ["./", "..", "compile-args-deps"] , "link-deps": ["./", "..", "link-deps"] , "link-args-deps": ["./", "..", "link-args-deps"] + , "run-libs-deps": ["./", "..", "run-libs-deps"] + , "run-libs-args-deps": ["./", "..", "run-libs-args-deps"] , "cflags-files-deps": ["./", "..", "cflags-files-deps"] , "ldflags-files-deps": ["./", "..", "ldflags-files-deps"] , "binary": ["./", "..", "bin artifact"] , "host transition": ["transitions", "for host"] , "target properties": ["transitions", "target properties"] , "stage": ["./", "../..", "stage_singleton_field"] + , "list_provider": ["./", "../..", "field_list_provider"] , "lint": ["./", "..", "lint information"] } , "expression": @@ -90,6 +93,10 @@ ] } ] + , ["run-libs", {"type": "CALL_EXPRESSION", "name": "run-libs-deps"}] + , [ "run-libs-args" + , {"type": "CALL_EXPRESSION", "name": "run-libs-args-deps"} + ] , ["binary", {"type": "CALL_EXPRESSION", "name": "binary"}] , [ "lint" , { "type": "if" @@ -167,6 +174,7 @@ , {"type": "var", "name": "test-args"} , {"type": "var", "name": "test-launcher"} , {"type": "var", "name": "staged test binary"} + , {"type": "var", "name": "run-libs"} ] } ] @@ -314,6 +322,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": @@ -331,6 +350,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"} + } } ] , [ "attempts" diff --git a/CC/test/RULES b/CC/test/RULES index c0d54b5..3401974 100644 --- a/CC/test/RULES +++ b/CC/test/RULES @@ -19,9 +19,12 @@ , "CXX" , "CFLAGS" , "CXXFLAGS" + , "LDFLAGS" , "ADD_CFLAGS" , "ADD_CXXFLAGS" + , "ADD_LDFLAGS" , "ENV" + , "BUILD_POSITION_INDEPENDENT" , "TEST_ENV" , "TIMEOUT_SCALE" , "CC_TEST_LAUNCHER" @@ -32,6 +35,7 @@ ] , "implicit": { "defaults": [["./", "..", "defaults"]] + , "shell-defaults": [["./", "../../shell", "defaults"]] , "runner": ["runner"] , "summarizer": [["./", "../../shell/test", "summarizer"]] } @@ -75,6 +79,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" @@ -97,6 +103,10 @@ [ "The flags for CXX to be used instead of the default ones" , "taken from the [\"CC\", \"defaults\"] target" ] + , "LDFLAGS": + [ "The linker flags do be used instead of the default ones" + , "taken from the [\"CC\", \"defaults\"] target" + ] , "ADD_CFLAGS": [ "The flags to add to the default ones for CC" , "taken from the [\"CC\", \"defaults\"] target" @@ -105,7 +115,12 @@ [ "The flags to add to the default ones for CXX" , "taken from the [\"CC\", \"defaults\"] target" ] + , "ADD_LDFLAGS": + [ "The linker flags to add to the default ones" + , "taken from the [\"CC\", \"defaults\"] target" + ] , "ENV": ["The environment for any action generated."] + , "BUILD_POSITION_INDEPENDENT": ["Build with -fPIC."] , "TEST_ENV": ["The environment for executing the test runner."] , "TIMEOUT_SCALE": ["Factor on how to scale the timeout for this test. Defaults to 1.0."] |