diff options
| author | Oliver Reiche <oliver.reiche@huawei.com> | 2022-12-16 17:20:09 +0100 |
|---|---|---|
| committer | Oliver Reiche <oliver.reiche@huawei.com> | 2022-12-16 21:07:50 +0100 |
| commit | 484092bb16cbf4683313c4adab8571699513a60b (patch) | |
| tree | 2184574e1c4c41857afae0f81157ec5634f763c8 /rules/shell | |
| parent | 81d2bf3484f23035a7d919c2c22d0485f13d8857 (diff) | |
| parent | 95284ec611a53ca9c7925aad4bbe3f6561de018a (diff) | |
| download | rules-cc-484092bb16cbf4683313c4adab8571699513a60b.tar.gz | |
Merge commit '95284ec611a53ca9c7925aad4bbe3f6561de018a' into shared-rules
Diffstat (limited to 'rules/shell')
| -rw-r--r-- | rules/shell/test/EXPRESSIONS | 18 | ||||
| -rwxr-xr-x | rules/shell/test/test_runner.sh | 1 |
2 files changed, 19 insertions, 0 deletions
diff --git a/rules/shell/test/EXPRESSIONS b/rules/shell/test/EXPRESSIONS index d9b1fbc..d1d7e64 100644 --- a/rules/shell/test/EXPRESSIONS +++ b/rules/shell/test/EXPRESSIONS @@ -12,6 +12,7 @@ , "imports": { "artifacts_list": ["./", "../..", "field_artifacts_list"] , "runfiles_list": ["./", "../..", "field_runfiles_list"] + , "map_provider": ["./", "../..", "field_map_provider"] } , "expression": { "type": "let*" @@ -66,6 +67,19 @@ } } ] + , [ "run-libs" + , { "type": "TREE" + , "$1": + { "type": "let*" + , "bindings": + [ ["fieldname", {"type": "var", "name": "deps-fieldname"}] + , ["provider", "run-libs"] + , ["transition", {"type": "var", "name": "deps-transition"}] + ] + , "body": {"type": "CALL_EXPRESSION", "name": "map_provider"} + } + } + ] , [ "attempt marker" , { "type": "if" , "cond": @@ -104,6 +118,10 @@ , "key": "work" , "value": {"type": "var", "name": "deps"} } + , { "type": "singleton_map" + , "key": "libs" + , "value": {"type": "var", "name": "run-libs"} + } , {"type": "var", "name": "runner"} , {"type": "var", "name": "test.sh"} , {"type": "var", "name": "attempt marker"} diff --git a/rules/shell/test/test_runner.sh b/rules/shell/test/test_runner.sh index a99d5b7..97c75ef 100755 --- a/rules/shell/test/test_runner.sh +++ b/rules/shell/test/test_runner.sh @@ -25,6 +25,7 @@ echo UNKNOWN > time-stop mkdir scratch export TEST_TMPDIR=$(realpath scratch) export TMPDIR="${TEST_TMPDIR}" +export LD_LIBRARY_PATH=$(realpath ./libs):$LD_LIBRARY_PATH # Change to the working directory; note: while unlikely, the test # might not have test data, so we have to ensure the presence of |