diff options
| author | Alberto Sartori <alberto.sartori@huawei.com> | 2024-05-14 14:43:20 +0200 |
|---|---|---|
| committer | Alberto Sartori <alberto.sartori@huawei.com> | 2024-05-15 17:24:36 +0200 |
| commit | 0f96e596f42ef8619f173c547d7ee6c1be3aba12 (patch) | |
| tree | dc66dd6ed3310aa9e4f909f81e4ef4d34a4911a1 /test/end-to-end/remote-execution/upload-test.sh | |
| parent | f976ed2ef08f835ff7d554a136d9af1131851802 (diff) | |
| download | justbuild-0f96e596f42ef8619f173c547d7ee6c1be3aba12.tar.gz | |
test/end-to-end: properly handle multiple key-value pairs in the...
...REMOTE_EXECUTION_PROPERTIES env variable.
Diffstat (limited to 'test/end-to-end/remote-execution/upload-test.sh')
| -rw-r--r-- | test/end-to-end/remote-execution/upload-test.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/test/end-to-end/remote-execution/upload-test.sh b/test/end-to-end/remote-execution/upload-test.sh index 91f6d069..44df84e3 100644 --- a/test/end-to-end/remote-execution/upload-test.sh +++ b/test/end-to-end/remote-execution/upload-test.sh @@ -64,7 +64,8 @@ export CONF="$(realpath repos.json)" # Build remotely REMOTE_EXECUTION_ARGS="-r ${REMOTE_EXECUTION_ADDRESS}" if [ "${REMOTE_EXECUTION_PROPERTIES:-}" != "" ]; then - REMOTE_EXECUTION_ARGS="${REMOTE_EXECUTION_ARGS} --remote-execution-property ${REMOTE_EXECUTION_PROPERTIES}" + REMOTE_EXECUTION_PROPS="$(printf " --remote-execution-property %s" ${REMOTE_EXECUTION_PROPERTIES})" + REMOTE_EXECUTION_ARGS="${REMOTE_EXECUTION_ARGS} ${REMOTE_EXECUTION_PROPS}" fi "${JUST}" build -L '["env", "PATH='"${PATH}"'"]' -C "${CONF}" --local-build-root="${LBRDIR_1}" ${ARGS} ${REMOTE_EXECUTION_ARGS} 2>&1 @@ -89,7 +90,8 @@ export CONF="$(realpath repos.json)" # Build remotely REMOTE_EXECUTION_ARGS="-r ${REMOTE_EXECUTION_ADDRESS}" if [ "${REMOTE_EXECUTION_PROPERTIES:-}" != "" ]; then - REMOTE_EXECUTION_ARGS="${REMOTE_EXECUTION_ARGS} --remote-execution-property ${REMOTE_EXECUTION_PROPERTIES}" + REMOTE_EXECUTION_PROPS="$(printf " --remote-execution-property %s" ${REMOTE_EXECUTION_PROPERTIES})" + REMOTE_EXECUTION_ARGS="${REMOTE_EXECUTION_ARGS} ${REMOTE_EXECUTION_PROPS}" fi "${JUST}" build -L '["env", "PATH='"${PATH}"'"]' -C "${CONF}" --local-build-root="${LBRDIR_2}" ${ARGS} ${REMOTE_EXECUTION_ARGS} 2>&1 |