From a0b64bc327b4ed57f8056f2597b3bc5e9736e8ee Mon Sep 17 00:00:00 2001 From: Klaus Aehlig Date: Tue, 8 Apr 2025 13:16:01 +0200 Subject: Extend tree-conflict test to also verify the offending target is reported properly --- test/end-to-end/actions/tree-conflicts.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'test') diff --git a/test/end-to-end/actions/tree-conflicts.sh b/test/end-to-end/actions/tree-conflicts.sh index 87b1f489..4054825e 100644 --- a/test/end-to-end/actions/tree-conflicts.sh +++ b/test/end-to-end/actions/tree-conflicts.sh @@ -46,11 +46,12 @@ cat > TARGETS <<'EOF' , "name": "merge" , "deps": ["foo", "good bar"] } -, "real conflict": +, "TheOffendingTarget": { "type": "disjoint_tree_overlay" , "name": "merge" , "deps": ["foo", "bad bar"] } +, "real conflict": {"type": "install", "dirs": [["TheOffendingTarget", "."]]} } EOF @@ -77,6 +78,8 @@ OVERLAY_ID=$(jq -r '.merge.data.id' "${OUT}/artifacts.json") -L '["env", "PATH='"${PATH}"'"]' 'real conflict' 2>&1 && exit 1 || : echo grep 'foobar' "${OUT}/log" # The location of the conflict should be mentioned +grep 'TheOffendingTarget' "${OUT}/log" # The actual origin of that tree-overlay + # should be reported as well echo echo OK -- cgit v1.2.3