diff options
| author | Klaus Aehlig <klaus.aehlig@huawei.com> | 2025-04-08 13:16:01 +0200 |
|---|---|---|
| committer | Klaus Aehlig <klaus.aehlig@huawei.com> | 2025-04-08 13:16:01 +0200 |
| commit | a0b64bc327b4ed57f8056f2597b3bc5e9736e8ee (patch) | |
| tree | 84cc7f570244c191edbacccc57cb9b52fcd0d4d6 /test/end-to-end/actions/tree-conflicts.sh | |
| parent | c4bfa359365152674608aaab29d10ae18e7d8236 (diff) | |
| download | justbuild-a0b64bc327b4ed57f8056f2597b3bc5e9736e8ee.tar.gz | |
Extend tree-conflict test to also verify the offending target is reported properly
Diffstat (limited to 'test/end-to-end/actions/tree-conflicts.sh')
| -rw-r--r-- | test/end-to-end/actions/tree-conflicts.sh | 5 |
1 files changed, 4 insertions, 1 deletions
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 |