summaryrefslogtreecommitdiff
path: root/test/end-to-end/remote-execution/tree-ops.sh
diff options
context:
space:
mode:
authorSascha Roloff <sascha.roloff@huawei.com>2025-05-05 12:04:58 +0200
committerSascha Roloff <sascha.roloff@huawei.com>2025-05-05 12:04:58 +0200
commit9ef8cad121348b9bfeb94350802c59abe9704f58 (patch)
treefdf3528135d9295328df8a7e2290e8b3f7332f4f /test/end-to-end/remote-execution/tree-ops.sh
parent5d1e72ca41228e28be75a000045606324bd4ba2f (diff)
downloadjustbuild-9ef8cad121348b9bfeb94350802c59abe9704f58.tar.gz
TreeOperationsUtils: apply AsyncMap to compute tree overlay
Diffstat (limited to 'test/end-to-end/remote-execution/tree-ops.sh')
-rw-r--r--test/end-to-end/remote-execution/tree-ops.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/end-to-end/remote-execution/tree-ops.sh b/test/end-to-end/remote-execution/tree-ops.sh
index fb661c7a..129ae2b2 100644
--- a/test/end-to-end/remote-execution/tree-ops.sh
+++ b/test/end-to-end/remote-execution/tree-ops.sh
@@ -106,7 +106,7 @@ OVERLAY_ID=$(jq -r '.overlay.data.id' "${OUT}/artifacts.json")
# Building the tree conflict should fail with a reasonable error message
"${JUST_MR}" --rc "${RC}" build \
-f "${OUT}/log" conflict 2>&1 && exit 1 || :
-grep 'mixed/data1..txt' "${OUT}/log"
+grep 'data1..txt' "${OUT}/log"
grep 'TheOffendingTarget' "${OUT}/log"
echo OK