summaryrefslogtreecommitdiff
path: root/test/end-to-end
diff options
context:
space:
mode:
Diffstat (limited to 'test/end-to-end')
-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