diff options
| author | Paul Cristian Sarbu <paul.cristian.sarbu@huawei.com> | 2023-12-06 16:22:56 +0100 |
|---|---|---|
| committer | Paul Cristian Sarbu <paul.cristian.sarbu@huawei.com> | 2023-12-06 16:47:37 +0100 |
| commit | c9149af8acfe9f016aff783f453e930809a16b95 (patch) | |
| tree | d70a9f8e0f8f264b6c9e426c96d9e814ce354125 /test/end-to-end/remote-execution | |
| parent | 8739f2bb6e07321c4e92e5610f92785cae950ff7 (diff) | |
| download | justbuild-c9149af8acfe9f016aff783f453e930809a16b95.tar.gz | |
install-cas cli: Remove remote execution properties and dispatch file...
...options from the generated help messages, as these are not used
for the install-cas subcommand.
This also updates the man page accordingly, where the dispatch file
was marked as supported, as well as update any test affected by
these changes.
Diffstat (limited to 'test/end-to-end/remote-execution')
| -rw-r--r-- | test/end-to-end/remote-execution/install-cas.sh | 5 | ||||
| -rw-r--r-- | test/end-to-end/remote-execution/install.sh | 9 |
2 files changed, 9 insertions, 5 deletions
diff --git a/test/end-to-end/remote-execution/install-cas.sh b/test/end-to-end/remote-execution/install-cas.sh index 32e34624..d8e53f7d 100644 --- a/test/end-to-end/remote-execution/install-cas.sh +++ b/test/end-to-end/remote-execution/install-cas.sh @@ -22,9 +22,10 @@ readonly OUTDIR="${PWD}/out" LOCAL_ARGS="--local-build-root ${LBRDIR}" REMOTE_ARGS="${LOCAL_ARGS} -r ${REMOTE_EXECUTION_ADDRESS}" +REMOTE_PROPS="" if [ "${REMOTE_EXECUTION_PROPERTIES:-}" != "" ] then - REMOTE_ARGS="${REMOTE_ARGS} --remote-execution-property ${REMOTE_EXECUTION_PROPERTIES}" + REMOTE_PROPS="--remote-execution-property ${REMOTE_EXECUTION_PROPERTIES}" fi if [ -n "${COMPATIBLE:-}" ] then @@ -48,7 +49,7 @@ cat > TARGETS <<'EOF' } EOF -"${JUST}" build ${REMOTE_ARGS} --dump-artifacts artifacts.json 2>&1 +"${JUST}" build ${REMOTE_ARGS} ${REMOTE_PROPS} --dump-artifacts artifacts.json 2>&1 echo cat artifacts.json OUT="$(jq -r '.out.id' artifacts.json)::t" diff --git a/test/end-to-end/remote-execution/install.sh b/test/end-to-end/remote-execution/install.sh index 11eac6c5..4f50a724 100644 --- a/test/end-to-end/remote-execution/install.sh +++ b/test/end-to-end/remote-execution/install.sh @@ -28,10 +28,11 @@ readonly OUTDIR_B="${TEST_TMPDIR}/out/instance-B" readonly OUTDIR_C="${TEST_TMPDIR}/out/instance-C" REMOTE_EXECUTION_ARGS="-r ${REMOTE_EXECUTION_ADDRESS}" +REMOTE_EXECUTION_PROPS="" LOCAL_ARGS="" if [ "${REMOTE_EXECUTION_PROPERTIES:-}" != "" ] then - REMOTE_EXECUTION_ARGS="${REMOTE_EXECUTION_ARGS} --remote-execution-property ${REMOTE_EXECUTION_PROPERTIES}" + REMOTE_EXECUTION_PROPS="--remote-execution-property ${REMOTE_EXECUTION_PROPERTIES}" fi if [ -n "${COMPATIBLE:-}" ] then @@ -57,7 +58,8 @@ cat > TARGETS <<'EOF' EOF "${JUST}" build --local-build-root "${LBRDIR_A}" \ - --dump-artifacts "${WRKDIR}/tree.json" ${REMOTE_EXECUTION_ARGS} 2>&1 + --dump-artifacts "${WRKDIR}/tree.json" \ + ${REMOTE_EXECUTION_ARGS} ${REMOTE_EXECUTION_PROPS} 2>&1 ## instance B should be able to fetch @@ -164,7 +166,8 @@ EOF "${JUST}" install --local-build-root "${LBRDIR_C}" \ --remember -o "${OUTDIR_C}/remote" \ - --dump-artifacts "${WRKDIR}/tree.json" ${REMOTE_EXECUTION_ARGS} 2>&1 + --dump-artifacts "${WRKDIR}/tree.json" \ + ${REMOTE_EXECUTION_ARGS} ${REMOTE_EXECUTION_PROPS} 2>&1 ## now it should also be available for local installation |