summaryrefslogtreecommitdiff
path: root/test/end-to-end/remote-execution
diff options
context:
space:
mode:
authorKlaus Aehlig <klaus.aehlig@huawei.com>2022-12-23 14:44:05 +0100
committerKlaus Aehlig <klaus.aehlig@huawei.com>2022-12-23 17:08:12 +0100
commite30f490bef55f0897bdf5ebf757324b181b4de42 (patch)
tree454820c144bf51fb7fee3c419d3fe5a31db3abc0 /test/end-to-end/remote-execution
parent408c7be636d247f9131b465fe6e78aa36946ecba (diff)
downloadjustbuild-e30f490bef55f0897bdf5ebf757324b181b4de42.tar.gz
end-to-end tests: go through a single target for just-mr
... so that we can switch in one go and have all tests use a new just-mr tool, e.g., once we consider the C++ implementation fully ready. This single point of switch will be relevant as the next commit will add the first end-to-end test for just-mr itself.
Diffstat (limited to 'test/end-to-end/remote-execution')
-rw-r--r--test/end-to-end/remote-execution/TARGETS5
-rw-r--r--test/end-to-end/remote-execution/native-protocol.sh2
2 files changed, 5 insertions, 2 deletions
diff --git a/test/end-to-end/remote-execution/TARGETS b/test/end-to-end/remote-execution/TARGETS
index 6d420dd0..0f7b5118 100644
--- a/test/end-to-end/remote-execution/TARGETS
+++ b/test/end-to-end/remote-execution/TARGETS
@@ -2,7 +2,10 @@
{ "type": ["@", "rules", "shell/test", "script"]
, "name": ["native-protocol"]
, "test": ["native-protocol.sh"]
- , "deps": [["test/end-to-end", "tool-under-test"], ["", "bin/just-mr.py"]]
+ , "deps":
+ [ ["test/end-to-end", "tool-under-test"]
+ , ["test/end-to-end", "mr-tool-under-test"]
+ ]
}
, "large-blobs":
{ "type": ["@", "rules", "shell/test", "script"]
diff --git a/test/end-to-end/remote-execution/native-protocol.sh b/test/end-to-end/remote-execution/native-protocol.sh
index fb2b10f0..aea047ad 100644
--- a/test/end-to-end/remote-execution/native-protocol.sh
+++ b/test/end-to-end/remote-execution/native-protocol.sh
@@ -20,7 +20,7 @@ readonly DIRNAME="dir"
readonly OUT_DIRNAME="${DIRNAME}out"
readonly GITDIR="${TEST_TMPDIR}/git-root"
readonly LBRDIR="${TEST_TMPDIR}/local-build-root"
-readonly JUST_MR="${PWD}/bin/just-mr.py"
+readonly JUST_MR="${PWD}/bin/mr-tool-under-test"
readonly JUST="${PWD}/bin/tool-under-test"
readonly RESULT="out.txt"