Author: Alison Zhang Date: 2026-09-25T12:02:39-04:00 New Revision: 44f262eb67778e6bcb7675599384e010062cae10
URL: https://github.com/llvm/llvm-project/commit/44f262eb67778e6bcb7675599384e010062cae10 DIFF: https://github.com/llvm/llvm-project/commit/44f262eb67778e6bcb7675599384e010062cae10.diff LOG: [test][ssaf][AIX] Fix sed -i portability for AIX (#226293) AIX's sed does not support the `-i` flag, causing the tests added in https://github.com/llvm/llvm-project/pull/216183 to fail on AIX. This patch updates the tests to use a POSIX-compliant redirect instead. Added: Modified: clang/test/Analysis/Scalable/ssaf-src-edit-merge/conflict-preserves-unrelated-zero-length-insert.test clang/test/Analysis/Scalable/ssaf-src-edit-merge/conflict-stderr-without-sarif.test clang/test/Analysis/Scalable/ssaf-src-edit-merge/empty-input.test clang/test/Analysis/Scalable/ssaf-src-edit-merge/identical-overlap.test clang/test/Analysis/Scalable/ssaf-src-edit-merge/no-conflict-sarif-empty.test clang/test/Analysis/Scalable/ssaf-src-edit-merge/non-overlapping.test clang/test/Analysis/Scalable/ssaf-src-edit-merge/order-invariance.test clang/test/Analysis/Scalable/ssaf-src-edit-merge/parent-dir-missing.test clang/test/Analysis/Scalable/ssaf-src-edit-merge/pre-dedup-identical-non-zero-length.test clang/test/Analysis/Scalable/ssaf-src-edit-merge/pre-dedup-zero-length-insert.test clang/test/Analysis/Scalable/ssaf-src-edit-merge/range-overlap-cluster-of-three-sarif.test clang/test/Analysis/Scalable/ssaf-src-edit-merge/range-overlap-conflict-sarif.test clang/test/Analysis/Scalable/ssaf-src-edit-merge/sarif-out-parent-dir-missing.test clang/test/Analysis/Scalable/ssaf-src-edit-merge/single-input-internal-conflict.test clang/test/Analysis/Scalable/ssaf-src-edit-merge/single-input.test clang/test/Analysis/Scalable/ssaf-src-edit-merge/three-input-all-conflict.test clang/test/Analysis/Scalable/ssaf-src-edit-merge/three-input-conflict-sarif.test clang/test/Analysis/Scalable/ssaf-src-edit-merge/two-conflicts-different-offsets-sarif.test clang/test/Analysis/Scalable/ssaf-src-edit-merge/two-input-conflict-sarif.test clang/test/Analysis/Scalable/ssaf-src-edit-merge/two-input-conflict.test Removed: ################################################################################ diff --git a/clang/test/Analysis/Scalable/ssaf-src-edit-merge/conflict-preserves-unrelated-zero-length-insert.test b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/conflict-preserves-unrelated-zero-length-insert.test index 871498e4d3e33..bdda153a0034b 100644 --- a/clang/test/Analysis/Scalable/ssaf-src-edit-merge/conflict-preserves-unrelated-zero-length-insert.test +++ b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/conflict-preserves-unrelated-zero-length-insert.test @@ -17,11 +17,9 @@ # RUN: mkdir -p %t.dir # RUN: printf '%%80s' '' > %t.dir/foo.cpp -# RUN: cp %S/Inputs/single-zero-length-insert.tpl.yaml %t.dir/a.yaml -# RUN: cp %S/Inputs/single-replacement.tpl.yaml %t.dir/b.yaml -# RUN: cp %S/Inputs/conflict-text-y.tpl.yaml %t.dir/c.yaml -# RUN: sed -i'' -e "s|@FOO@|%/t.dir/foo.cpp|g" \ -# RUN: %t.dir/a.yaml %t.dir/b.yaml %t.dir/c.yaml +# RUN: sed "s|@FOO@|%/t.dir/foo.cpp|g" %S/Inputs/single-zero-length-insert.tpl.yaml > %t.dir/a.yaml +# RUN: sed "s|@FOO@|%/t.dir/foo.cpp|g" %S/Inputs/single-replacement.tpl.yaml > %t.dir/b.yaml +# RUN: sed "s|@FOO@|%/t.dir/foo.cpp|g" %S/Inputs/conflict-text-y.tpl.yaml > %t.dir/c.yaml # RUN: clang-ssaf-src-edit-merge \ # RUN: -o %t.dir/merged.yaml %t.dir/a.yaml %t.dir/b.yaml %t.dir/c.yaml \ diff --git a/clang/test/Analysis/Scalable/ssaf-src-edit-merge/conflict-stderr-without-sarif.test b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/conflict-stderr-without-sarif.test index 1067c49e37a54..9d58c9f0fbc85 100644 --- a/clang/test/Analysis/Scalable/ssaf-src-edit-merge/conflict-stderr-without-sarif.test +++ b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/conflict-stderr-without-sarif.test @@ -6,9 +6,8 @@ # RUN: mkdir -p %t.dir # RUN: printf '%%80s' '' > %t.dir/foo.cpp -# RUN: cp %S/Inputs/single-replacement.tpl.yaml %t.dir/a.yaml -# RUN: cp %S/Inputs/conflict-text-y.tpl.yaml %t.dir/b.yaml -# RUN: sed -i'' -e "s|@FOO@|%/t.dir/foo.cpp|g" %t.dir/a.yaml %t.dir/b.yaml +# RUN: sed "s|@FOO@|%/t.dir/foo.cpp|g" %S/Inputs/single-replacement.tpl.yaml > %t.dir/a.yaml +# RUN: sed "s|@FOO@|%/t.dir/foo.cpp|g" %S/Inputs/conflict-text-y.tpl.yaml > %t.dir/b.yaml # RUN: clang-ssaf-src-edit-merge \ # RUN: -o %t.dir/merged.yaml %t.dir/a.yaml %t.dir/b.yaml \ diff --git a/clang/test/Analysis/Scalable/ssaf-src-edit-merge/empty-input.test b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/empty-input.test index ba08d60ade242..c45b8001797c0 100644 --- a/clang/test/Analysis/Scalable/ssaf-src-edit-merge/empty-input.test +++ b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/empty-input.test @@ -6,9 +6,8 @@ # RUN: mkdir -p %t.dir # RUN: printf '%%80s' '' > %t.dir/foo.cpp -# RUN: cp %S/Inputs/empty.tpl.yaml %t.dir/a.yaml -# RUN: cp %S/Inputs/empty.tpl.yaml %t.dir/b.yaml -# RUN: sed -i'' -e "s|@FOO@|%/t.dir/foo.cpp|g" %t.dir/a.yaml %t.dir/b.yaml +# RUN: sed "s|@FOO@|%/t.dir/foo.cpp|g" %S/Inputs/empty.tpl.yaml > %t.dir/a.yaml +# RUN: sed "s|@FOO@|%/t.dir/foo.cpp|g" %S/Inputs/empty.tpl.yaml > %t.dir/b.yaml # RUN: clang-ssaf-src-edit-merge -o %t.dir/merged.yaml %t.dir/a.yaml %t.dir/b.yaml \ # RUN: 2> %t.dir/stderr.txt diff --git a/clang/test/Analysis/Scalable/ssaf-src-edit-merge/identical-overlap.test b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/identical-overlap.test index 99427f0459b26..300a6f9add392 100644 --- a/clang/test/Analysis/Scalable/ssaf-src-edit-merge/identical-overlap.test +++ b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/identical-overlap.test @@ -7,9 +7,8 @@ # RUN: printf '%%80s' '' > %t.dir/foo.cpp # Use the same single-replacement template for both inputs. -# RUN: cp %S/Inputs/single-replacement.tpl.yaml %t.dir/a.yaml -# RUN: cp %S/Inputs/single-replacement.tpl.yaml %t.dir/b.yaml -# RUN: sed -i'' -e "s|@FOO@|%/t.dir/foo.cpp|g" %t.dir/a.yaml %t.dir/b.yaml +# RUN: sed "s|@FOO@|%/t.dir/foo.cpp|g" %S/Inputs/single-replacement.tpl.yaml > %t.dir/a.yaml +# RUN: sed "s|@FOO@|%/t.dir/foo.cpp|g" %S/Inputs/single-replacement.tpl.yaml > %t.dir/b.yaml # RUN: clang-ssaf-src-edit-merge -o %t.dir/merged.yaml %t.dir/a.yaml %t.dir/b.yaml \ # RUN: 2> %t.dir/stderr.txt diff --git a/clang/test/Analysis/Scalable/ssaf-src-edit-merge/no-conflict-sarif-empty.test b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/no-conflict-sarif-empty.test index 9575025ee00f3..3353d4b4470be 100644 --- a/clang/test/Analysis/Scalable/ssaf-src-edit-merge/no-conflict-sarif-empty.test +++ b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/no-conflict-sarif-empty.test @@ -6,9 +6,8 @@ # RUN: mkdir -p %t.dir # RUN: printf '%%80s' '' > %t.dir/foo.cpp -# RUN: cp %S/Inputs/non-overlapping-a.tpl.yaml %t.dir/a.yaml -# RUN: cp %S/Inputs/non-overlapping-b.tpl.yaml %t.dir/b.yaml -# RUN: sed -i'' -e "s|@FOO@|%/t.dir/foo.cpp|g" %t.dir/a.yaml %t.dir/b.yaml +# RUN: sed "s|@FOO@|%/t.dir/foo.cpp|g" %S/Inputs/non-overlapping-a.tpl.yaml > %t.dir/a.yaml +# RUN: sed "s|@FOO@|%/t.dir/foo.cpp|g" %S/Inputs/non-overlapping-b.tpl.yaml > %t.dir/b.yaml # RUN: clang-ssaf-src-edit-merge \ # RUN: -o %t.dir/merged.yaml \ diff --git a/clang/test/Analysis/Scalable/ssaf-src-edit-merge/non-overlapping.test b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/non-overlapping.test index 13310acae189e..314d35ff1b77e 100644 --- a/clang/test/Analysis/Scalable/ssaf-src-edit-merge/non-overlapping.test +++ b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/non-overlapping.test @@ -8,9 +8,8 @@ # 80 bytes is plenty for both Offset=10 and Offset=20. # RUN: printf '%%80s' '' > %t.dir/foo.cpp -# RUN: cp %S/Inputs/non-overlapping-a.tpl.yaml %t.dir/a.yaml -# RUN: cp %S/Inputs/non-overlapping-b.tpl.yaml %t.dir/b.yaml -# RUN: sed -i'' -e "s|@FOO@|%/t.dir/foo.cpp|g" %t.dir/a.yaml %t.dir/b.yaml +# RUN: sed "s|@FOO@|%/t.dir/foo.cpp|g" %S/Inputs/non-overlapping-a.tpl.yaml > %t.dir/a.yaml +# RUN: sed "s|@FOO@|%/t.dir/foo.cpp|g" %S/Inputs/non-overlapping-b.tpl.yaml > %t.dir/b.yaml # RUN: clang-ssaf-src-edit-merge -o %t.dir/merged.yaml %t.dir/a.yaml %t.dir/b.yaml \ # RUN: 2> %t.dir/stderr.txt diff --git a/clang/test/Analysis/Scalable/ssaf-src-edit-merge/order-invariance.test b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/order-invariance.test index 9a10eba5c7fc1..84d2142326957 100644 --- a/clang/test/Analysis/Scalable/ssaf-src-edit-merge/order-invariance.test +++ b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/order-invariance.test @@ -7,9 +7,8 @@ # RUN: mkdir -p %t.dir # RUN: printf '%%80s' '' > %t.dir/foo.cpp -# RUN: cp %S/Inputs/non-overlapping-a.tpl.yaml %t.dir/a.yaml -# RUN: cp %S/Inputs/non-overlapping-b.tpl.yaml %t.dir/b.yaml -# RUN: sed -i'' -e "s|@FOO@|%/t.dir/foo.cpp|g" %t.dir/a.yaml %t.dir/b.yaml +# RUN: sed "s|@FOO@|%/t.dir/foo.cpp|g" %S/Inputs/non-overlapping-a.tpl.yaml > %t.dir/a.yaml +# RUN: sed "s|@FOO@|%/t.dir/foo.cpp|g" %S/Inputs/non-overlapping-b.tpl.yaml > %t.dir/b.yaml # Run the tool twice with diff erent argv orders. # RUN: clang-ssaf-src-edit-merge -o %t.dir/merged-ab.yaml %t.dir/a.yaml %t.dir/b.yaml diff --git a/clang/test/Analysis/Scalable/ssaf-src-edit-merge/parent-dir-missing.test b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/parent-dir-missing.test index 1001363d1302e..0d6e998949bd0 100644 --- a/clang/test/Analysis/Scalable/ssaf-src-edit-merge/parent-dir-missing.test +++ b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/parent-dir-missing.test @@ -4,8 +4,7 @@ # RUN: rm -rf %t.dir # RUN: mkdir -p %t.dir # RUN: printf '%%80s' '' > %t.dir/foo.cpp -# RUN: cp %S/Inputs/single-replacement.tpl.yaml %t.dir/a.yaml -# RUN: sed -i'' -e "s|@FOO@|%/t.dir/foo.cpp|g" %t.dir/a.yaml +# RUN: sed "s|@FOO@|%/t.dir/foo.cpp|g" %S/Inputs/single-replacement.tpl.yaml > %t.dir/a.yaml # Note: %t.dir/no-such-subdir does NOT exist. The output path therefore # cannot be opened and the tool must fail. diff --git a/clang/test/Analysis/Scalable/ssaf-src-edit-merge/pre-dedup-identical-non-zero-length.test b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/pre-dedup-identical-non-zero-length.test index 4444ea0703445..ce802f23ecae7 100644 --- a/clang/test/Analysis/Scalable/ssaf-src-edit-merge/pre-dedup-identical-non-zero-length.test +++ b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/pre-dedup-identical-non-zero-length.test @@ -8,9 +8,8 @@ # RUN: printf '%%80s' '' > %t.dir/foo.cpp # Two inputs with byte-identical Length: 7 replacements at offset 10. -# RUN: cp %S/Inputs/single-non-zero-length-replacement.tpl.yaml %t.dir/a.yaml -# RUN: cp %S/Inputs/single-non-zero-length-replacement.tpl.yaml %t.dir/b.yaml -# RUN: sed -i'' -e "s|@FOO@|%/t.dir/foo.cpp|g" %t.dir/a.yaml %t.dir/b.yaml +# RUN: sed "s|@FOO@|%/t.dir/foo.cpp|g" %S/Inputs/single-non-zero-length-replacement.tpl.yaml > %t.dir/a.yaml +# RUN: sed "s|@FOO@|%/t.dir/foo.cpp|g" %S/Inputs/single-non-zero-length-replacement.tpl.yaml > %t.dir/b.yaml # RUN: clang-ssaf-src-edit-merge -o %t.dir/merged.yaml %t.dir/a.yaml %t.dir/b.yaml \ # RUN: 2> %t.dir/stderr.txt diff --git a/clang/test/Analysis/Scalable/ssaf-src-edit-merge/pre-dedup-zero-length-insert.test b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/pre-dedup-zero-length-insert.test index a5f9b93b92715..a545ad37b385f 100644 --- a/clang/test/Analysis/Scalable/ssaf-src-edit-merge/pre-dedup-zero-length-insert.test +++ b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/pre-dedup-zero-length-insert.test @@ -10,9 +10,8 @@ # RUN: printf '%%80s' '' > %t.dir/foo.cpp # Two inputs with byte-identical zero-length insertions at offset 10. -# RUN: cp %S/Inputs/single-zero-length-insert.tpl.yaml %t.dir/a.yaml -# RUN: cp %S/Inputs/single-zero-length-insert.tpl.yaml %t.dir/b.yaml -# RUN: sed -i'' -e "s|@FOO@|%/t.dir/foo.cpp|g" %t.dir/a.yaml %t.dir/b.yaml +# RUN: sed "s|@FOO@|%/t.dir/foo.cpp|g" %S/Inputs/single-zero-length-insert.tpl.yaml > %t.dir/a.yaml +# RUN: sed "s|@FOO@|%/t.dir/foo.cpp|g" %S/Inputs/single-zero-length-insert.tpl.yaml > %t.dir/b.yaml # RUN: clang-ssaf-src-edit-merge -o %t.dir/merged.yaml %t.dir/a.yaml %t.dir/b.yaml \ # RUN: 2> %t.dir/stderr.txt diff --git a/clang/test/Analysis/Scalable/ssaf-src-edit-merge/range-overlap-cluster-of-three-sarif.test b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/range-overlap-cluster-of-three-sarif.test index e4b13b874d5e1..742ac28ef1a54 100644 --- a/clang/test/Analysis/Scalable/ssaf-src-edit-merge/range-overlap-cluster-of-three-sarif.test +++ b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/range-overlap-cluster-of-three-sarif.test @@ -17,8 +17,7 @@ # RUN: mkdir -p %t.dir # RUN: printf '%%80s' '' > %t.dir/foo.cpp -# RUN: cp %S/Inputs/range-overlap-cluster-of-three.tpl.yaml %t.dir/a.yaml -# RUN: sed -i'' -e "s|@FOO@|%/t.dir/foo.cpp|g" %t.dir/a.yaml +# RUN: sed "s|@FOO@|%/t.dir/foo.cpp|g" %S/Inputs/range-overlap-cluster-of-three.tpl.yaml > %t.dir/a.yaml # RUN: clang-ssaf-src-edit-merge \ # RUN: -o %t.dir/merged.yaml \ diff --git a/clang/test/Analysis/Scalable/ssaf-src-edit-merge/range-overlap-conflict-sarif.test b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/range-overlap-conflict-sarif.test index d5fe203df7f44..19c04176fd37b 100644 --- a/clang/test/Analysis/Scalable/ssaf-src-edit-merge/range-overlap-conflict-sarif.test +++ b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/range-overlap-conflict-sarif.test @@ -13,8 +13,7 @@ # RUN: mkdir -p %t.dir # RUN: printf '%%80s' '' > %t.dir/foo.cpp -# RUN: cp %S/Inputs/range-overlap-distinct-offsets.tpl.yaml %t.dir/a.yaml -# RUN: sed -i'' -e "s|@FOO@|%/t.dir/foo.cpp|g" %t.dir/a.yaml +# RUN: sed "s|@FOO@|%/t.dir/foo.cpp|g" %S/Inputs/range-overlap-distinct-offsets.tpl.yaml > %t.dir/a.yaml # RUN: clang-ssaf-src-edit-merge \ # RUN: -o %t.dir/merged.yaml \ diff --git a/clang/test/Analysis/Scalable/ssaf-src-edit-merge/sarif-out-parent-dir-missing.test b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/sarif-out-parent-dir-missing.test index 0efdbd77d5377..3ce807ffd59d6 100644 --- a/clang/test/Analysis/Scalable/ssaf-src-edit-merge/sarif-out-parent-dir-missing.test +++ b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/sarif-out-parent-dir-missing.test @@ -5,8 +5,7 @@ # RUN: rm -rf %t.dir # RUN: mkdir -p %t.dir # RUN: printf '%%80s' '' > %t.dir/foo.cpp -# RUN: cp %S/Inputs/single-replacement.tpl.yaml %t.dir/a.yaml -# RUN: sed -i'' -e "s|@FOO@|%/t.dir/foo.cpp|g" %t.dir/a.yaml +# RUN: sed "s|@FOO@|%/t.dir/foo.cpp|g" %S/Inputs/single-replacement.tpl.yaml > %t.dir/a.yaml # Note: %t.dir/nonexistent-subdir does NOT exist. # RUN: not clang-ssaf-src-edit-merge \ diff --git a/clang/test/Analysis/Scalable/ssaf-src-edit-merge/single-input-internal-conflict.test b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/single-input-internal-conflict.test index bd7bd68e7b632..e14ead37fdf1a 100644 --- a/clang/test/Analysis/Scalable/ssaf-src-edit-merge/single-input-internal-conflict.test +++ b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/single-input-internal-conflict.test @@ -7,8 +7,7 @@ # RUN: mkdir -p %t.dir # RUN: printf '%%80s' '' > %t.dir/foo.cpp -# RUN: cp %S/Inputs/internal-conflict.tpl.yaml %t.dir/a.yaml -# RUN: sed -i'' -e "s|@FOO@|%/t.dir/foo.cpp|g" %t.dir/a.yaml +# RUN: sed "s|@FOO@|%/t.dir/foo.cpp|g" %S/Inputs/internal-conflict.tpl.yaml > %t.dir/a.yaml # RUN: clang-ssaf-src-edit-merge -o %t.dir/merged.yaml %t.dir/a.yaml \ # RUN: 2> %t.dir/stderr.txt diff --git a/clang/test/Analysis/Scalable/ssaf-src-edit-merge/single-input.test b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/single-input.test index f571dfeb72a3d..55c9399373f2a 100644 --- a/clang/test/Analysis/Scalable/ssaf-src-edit-merge/single-input.test +++ b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/single-input.test @@ -6,8 +6,7 @@ # RUN: mkdir -p %t.dir # RUN: printf '%%80s' '' > %t.dir/foo.cpp -# RUN: cp %S/Inputs/single-replacement.tpl.yaml %t.dir/a.yaml -# RUN: sed -i'' -e "s|@FOO@|%/t.dir/foo.cpp|g" %t.dir/a.yaml +# RUN: sed "s|@FOO@|%/t.dir/foo.cpp|g" %S/Inputs/single-replacement.tpl.yaml > %t.dir/a.yaml # RUN: clang-ssaf-src-edit-merge -o %t.dir/merged.yaml %t.dir/a.yaml \ # RUN: 2> %t.dir/stderr.txt diff --git a/clang/test/Analysis/Scalable/ssaf-src-edit-merge/three-input-all-conflict.test b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/three-input-all-conflict.test index 3c1611453bc7b..cc59927176736 100644 --- a/clang/test/Analysis/Scalable/ssaf-src-edit-merge/three-input-all-conflict.test +++ b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/three-input-all-conflict.test @@ -8,11 +8,9 @@ # RUN: mkdir -p %t.dir # RUN: printf '%%80s' '' > %t.dir/foo.cpp -# RUN: cp %S/Inputs/single-replacement.tpl.yaml %t.dir/a.yaml -# RUN: cp %S/Inputs/conflict-text-y.tpl.yaml %t.dir/b.yaml -# RUN: cp %S/Inputs/conflict-text-z.tpl.yaml %t.dir/c.yaml -# RUN: sed -i'' -e "s|@FOO@|%/t.dir/foo.cpp|g" \ -# RUN: %t.dir/a.yaml %t.dir/b.yaml %t.dir/c.yaml +# RUN: sed "s|@FOO@|%/t.dir/foo.cpp|g" %S/Inputs/single-replacement.tpl.yaml > %t.dir/a.yaml +# RUN: sed "s|@FOO@|%/t.dir/foo.cpp|g" %S/Inputs/conflict-text-y.tpl.yaml > %t.dir/b.yaml +# RUN: sed "s|@FOO@|%/t.dir/foo.cpp|g" %S/Inputs/conflict-text-z.tpl.yaml > %t.dir/c.yaml # RUN: clang-ssaf-src-edit-merge \ # RUN: -o %t.dir/merged.yaml %t.dir/a.yaml %t.dir/b.yaml %t.dir/c.yaml \ diff --git a/clang/test/Analysis/Scalable/ssaf-src-edit-merge/three-input-conflict-sarif.test b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/three-input-conflict-sarif.test index b45299601c80e..2e7e32c16425b 100644 --- a/clang/test/Analysis/Scalable/ssaf-src-edit-merge/three-input-conflict-sarif.test +++ b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/three-input-conflict-sarif.test @@ -5,11 +5,9 @@ # RUN: mkdir -p %t.dir # RUN: printf '%%80s' '' > %t.dir/foo.cpp -# RUN: cp %S/Inputs/single-replacement.tpl.yaml %t.dir/a.yaml -# RUN: cp %S/Inputs/conflict-text-y.tpl.yaml %t.dir/b.yaml -# RUN: cp %S/Inputs/conflict-text-z.tpl.yaml %t.dir/c.yaml -# RUN: sed -i'' -e "s|@FOO@|%/t.dir/foo.cpp|g" \ -# RUN: %t.dir/a.yaml %t.dir/b.yaml %t.dir/c.yaml +# RUN: sed "s|@FOO@|%/t.dir/foo.cpp|g" %S/Inputs/single-replacement.tpl.yaml > %t.dir/a.yaml +# RUN: sed "s|@FOO@|%/t.dir/foo.cpp|g" %S/Inputs/conflict-text-y.tpl.yaml > %t.dir/b.yaml +# RUN: sed "s|@FOO@|%/t.dir/foo.cpp|g" %S/Inputs/conflict-text-z.tpl.yaml > %t.dir/c.yaml # RUN: clang-ssaf-src-edit-merge \ # RUN: -o %t.dir/merged.yaml \ diff --git a/clang/test/Analysis/Scalable/ssaf-src-edit-merge/two-conflicts- diff erent-offsets-sarif.test b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/two-conflicts- diff erent-offsets-sarif.test index 6f86a54d561ae..e6d080018463c 100644 --- a/clang/test/Analysis/Scalable/ssaf-src-edit-merge/two-conflicts- diff erent-offsets-sarif.test +++ b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/two-conflicts- diff erent-offsets-sarif.test @@ -7,12 +7,10 @@ # RUN: mkdir -p %t.dir # RUN: printf '%%80s' '' > %t.dir/foo.cpp -# RUN: cp %S/Inputs/single-replacement.tpl.yaml %t.dir/a.yaml -# RUN: cp %S/Inputs/conflict-text-y.tpl.yaml %t.dir/b.yaml -# RUN: cp %S/Inputs/single-replacement-offset-30.tpl.yaml %t.dir/c.yaml -# RUN: cp %S/Inputs/conflict-text-q-offset-30.tpl.yaml %t.dir/d.yaml -# RUN: sed -i'' -e "s|@FOO@|%/t.dir/foo.cpp|g" \ -# RUN: %t.dir/a.yaml %t.dir/b.yaml %t.dir/c.yaml %t.dir/d.yaml +# RUN: sed "s|@FOO@|%/t.dir/foo.cpp|g" %S/Inputs/single-replacement.tpl.yaml > %t.dir/a.yaml +# RUN: sed "s|@FOO@|%/t.dir/foo.cpp|g" %S/Inputs/conflict-text-y.tpl.yaml > %t.dir/b.yaml +# RUN: sed "s|@FOO@|%/t.dir/foo.cpp|g" %S/Inputs/single-replacement-offset-30.tpl.yaml > %t.dir/c.yaml +# RUN: sed "s|@FOO@|%/t.dir/foo.cpp|g" %S/Inputs/conflict-text-q-offset-30.tpl.yaml > %t.dir/d.yaml # RUN: clang-ssaf-src-edit-merge \ # RUN: -o %t.dir/merged.yaml \ diff --git a/clang/test/Analysis/Scalable/ssaf-src-edit-merge/two-input-conflict-sarif.test b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/two-input-conflict-sarif.test index 43c6093ed3ed7..742557b3b2dc2 100644 --- a/clang/test/Analysis/Scalable/ssaf-src-edit-merge/two-input-conflict-sarif.test +++ b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/two-input-conflict-sarif.test @@ -8,9 +8,8 @@ # RUN: mkdir -p %t.dir # RUN: printf '%%80s' '' > %t.dir/foo.cpp -# RUN: cp %S/Inputs/single-replacement.tpl.yaml %t.dir/a.yaml -# RUN: cp %S/Inputs/conflict-text-y.tpl.yaml %t.dir/b.yaml -# RUN: sed -i'' -e "s|@FOO@|%/t.dir/foo.cpp|g" %t.dir/a.yaml %t.dir/b.yaml +# RUN: sed "s|@FOO@|%/t.dir/foo.cpp|g" %S/Inputs/single-replacement.tpl.yaml > %t.dir/a.yaml +# RUN: sed "s|@FOO@|%/t.dir/foo.cpp|g" %S/Inputs/conflict-text-y.tpl.yaml > %t.dir/b.yaml # RUN: clang-ssaf-src-edit-merge \ # RUN: -o %t.dir/merged.yaml \ diff --git a/clang/test/Analysis/Scalable/ssaf-src-edit-merge/two-input-conflict.test b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/two-input-conflict.test index b6e8fa5a5fae8..029973d57f3b2 100644 --- a/clang/test/Analysis/Scalable/ssaf-src-edit-merge/two-input-conflict.test +++ b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/two-input-conflict.test @@ -8,9 +8,8 @@ # RUN: mkdir -p %t.dir # RUN: printf '%%80s' '' > %t.dir/foo.cpp -# RUN: cp %S/Inputs/single-replacement.tpl.yaml %t.dir/a.yaml -# RUN: cp %S/Inputs/conflict-text-y.tpl.yaml %t.dir/b.yaml -# RUN: sed -i'' -e "s|@FOO@|%/t.dir/foo.cpp|g" %t.dir/a.yaml %t.dir/b.yaml +# RUN: sed "s|@FOO@|%/t.dir/foo.cpp|g" %S/Inputs/single-replacement.tpl.yaml > %t.dir/a.yaml +# RUN: sed "s|@FOO@|%/t.dir/foo.cpp|g" %S/Inputs/conflict-text-y.tpl.yaml > %t.dir/b.yaml # RUN: clang-ssaf-src-edit-merge -o %t.dir/merged.yaml %t.dir/a.yaml %t.dir/b.yaml \ # RUN: 2> %t.dir/stderr.txt _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
