diff options
| author | Klaus Aehlig <klaus.aehlig@huawei.com> | 2024-03-05 16:58:32 +0100 |
|---|---|---|
| committer | Klaus Aehlig <klaus.aehlig@huawei.com> | 2024-03-05 18:54:47 +0100 |
| commit | af0e6f9bd5c817403dc27558fce73a11ee9dbc83 (patch) | |
| tree | 436697803985f29a88cbd28d0f8559c0c4cc100c /test/end-to-end/serve-service | |
| parent | 45a8ad3e863d0f060574dc3be47070670574fdab (diff) | |
| download | justbuild-af0e6f9bd5c817403dc27558fce73a11ee9dbc83.tar.gz | |
end-to-end test: also test foreign-file setup in compatible mode
Diffstat (limited to 'test/end-to-end/serve-service')
| -rw-r--r-- | test/end-to-end/serve-service/serve-distdir-root/TARGETS | 12 | ||||
| -rw-r--r-- | test/end-to-end/serve-service/serve-distdir-root/foreign-file.sh | 7 |
2 files changed, 7 insertions, 12 deletions
diff --git a/test/end-to-end/serve-service/serve-distdir-root/TARGETS b/test/end-to-end/serve-service/serve-distdir-root/TARGETS index 2bde588a..1240f53b 100644 --- a/test/end-to-end/serve-service/serve-distdir-root/TARGETS +++ b/test/end-to-end/serve-service/serve-distdir-root/TARGETS @@ -58,16 +58,6 @@ { "type": "install" , "arguments_config": ["TEST_COMPATIBLE_REMOTE"] , "tainted": ["test"] - , "deps": - { "type": "++" - , "$1": - [ ["present", "absent", "upload"] - , { "type": "if" - , "cond": {"type": "var", "name": "TEST_COMPATIBLE_REMOTE"} - , "then": [] - , "else": ["foreign-file"] - } - ] - } + , "deps": ["present", "absent", "upload", "foreign-file"] } } diff --git a/test/end-to-end/serve-service/serve-distdir-root/foreign-file.sh b/test/end-to-end/serve-service/serve-distdir-root/foreign-file.sh index 78b2cc7c..18dff9e0 100644 --- a/test/end-to-end/serve-service/serve-distdir-root/foreign-file.sh +++ b/test/end-to-end/serve-service/serve-distdir-root/foreign-file.sh @@ -24,7 +24,12 @@ readonly LBR="${TEST_TMPDIR}/local-build-root" readonly DATA_DIR="${PWD}/foreign-file-data" readonly OUT="${TEST_TMPDIR}/out" -ENDPOINT_ARGS="-r ${REMOTE_EXECUTION_ADDRESS} -R ${SERVE}" +COMPAT="" +if [ "${COMPATIBLE:-}" = "YES" ]; then + COMPAT="--compatible" +fi + +ENDPOINT_ARGS="-r ${REMOTE_EXECUTION_ADDRESS} -R ${SERVE} ${COMPAT}" echo echo Will use endpoint arguments ${ENDPOINT_ARGS} |