diff options
| author | Oliver Reiche <oliver.reiche@huawei.com> | 2023-05-25 12:59:25 +0200 |
|---|---|---|
| committer | Oliver Reiche <oliver.reiche@huawei.com> | 2023-05-30 15:01:41 +0200 |
| commit | 82f62e3a244d01d93aae91da9fd41855a6ddd1ce (patch) | |
| tree | b4df2e079ce93ed9d0de64bd85e9a310315ef2a9 /test/utils | |
| parent | ae2e515ab84ea3ab08764685f84441c0741f8039 (diff) | |
| download | justbuild-82f62e3a244d01d93aae91da9fd41855a6ddd1ce.tar.gz | |
tests: Used installed just/just-mr in remote tests
... as those binaries might need run-libs.
Diffstat (limited to 'test/utils')
| -rw-r--r-- | test/utils/remote_execution/RULES | 5 | ||||
| -rwxr-xr-x | test/utils/remote_execution/test_runner.py | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/test/utils/remote_execution/RULES b/test/utils/remote_execution/RULES index 603ba233..af8d440f 100644 --- a/test/utils/remote_execution/RULES +++ b/test/utils/remote_execution/RULES @@ -29,7 +29,7 @@ , "implicit": { "defaults": [["@", "rules", "CC", "defaults"]] , "runner": ["test_runner.py"] - , "just": [["@", "src", "", "just"]] + , "just": [["@", "src", "", "installed just"]] } , "field_doc": { "name": @@ -168,8 +168,7 @@ , ["location", "runner"] , ["runner", {"type": "CALL_EXPRESSION", "name": "stage"}] , ["fieldname", "just"] - , ["location", "just"] - , ["just", {"type": "CALL_EXPRESSION", "name": "stage"}] + , ["just", {"type": "CALL_EXPRESSION", "name": "artifacts"}] , [ "compatible-remote" , { "type": "singleton_map" , "key": "compatible-remote.json" diff --git a/test/utils/remote_execution/test_runner.py b/test/utils/remote_execution/test_runner.py index c54acd3f..5295efa3 100755 --- a/test/utils/remote_execution/test_runner.py +++ b/test/utils/remote_execution/test_runner.py @@ -57,7 +57,7 @@ if os.path.exists(REMOTE_INFO): os.remove(REMOTE_INFO) remote_cmd = [ - "./just", "execute", + "./bin/just", "execute", "--info-file", REMOTE_INFO, "--local-build-root", REMOTE_LBR, "--log-limit", "6", "--plain-log", |