https://github.com/t-rasmud created https://github.com/llvm/llvm-project/pull/219857
Colocates it with the other clang-ssaf-* tools (clang-ssaf-analyzer, clang-ssaf-format, clang-ssaf-linker), which already live under clang/tools with tests under clang/test/Analysis/Scalable. rdar://179151250 >From 2e60e99cf598da4561a0b4a0c1b64e7c957ab6d7 Mon Sep 17 00:00:00 2001 From: Rashmi Mudduluru <[email protected]> Date: Sun, 30 Aug 2026 15:57:29 -0700 Subject: [PATCH] [clang][ssaf] Move clang-ssaf-src-edit-merge from clang-tools-extra to clang/tools Colocates it with the other clang-ssaf-* tools (clang-ssaf-analyzer, clang-ssaf-format, clang-ssaf-linker), which already live under clang/tools with tests under clang/test/Analysis/Scalable. rdar://179151250 --- clang-tools-extra/CMakeLists.txt | 1 - clang-tools-extra/test/CMakeLists.txt | 1 - clang-tools-extra/test/clang-ssaf-src-edit-merge/lit.local.cfg | 1 - .../Inputs/conflict-text-q-offset-30.tpl.yaml | 0 .../ssaf-src-edit-merge}/Inputs/conflict-text-y.tpl.yaml | 0 .../ssaf-src-edit-merge}/Inputs/conflict-text-z.tpl.yaml | 0 .../Analysis/Scalable/ssaf-src-edit-merge}/Inputs/empty.tpl.yaml | 0 .../ssaf-src-edit-merge}/Inputs/internal-conflict.tpl.yaml | 0 .../ssaf-src-edit-merge}/Inputs/non-overlapping-a.tpl.yaml | 0 .../ssaf-src-edit-merge}/Inputs/non-overlapping-b.tpl.yaml | 0 .../Inputs/range-overlap-cluster-of-three.tpl.yaml | 0 .../Inputs/range-overlap-distinct-offsets.tpl.yaml | 0 .../Inputs/single-non-zero-length-replacement.tpl.yaml | 0 .../Inputs/single-replacement-offset-30.tpl.yaml | 0 .../ssaf-src-edit-merge}/Inputs/single-replacement.tpl.yaml | 0 .../Inputs/single-zero-length-insert.tpl.yaml | 0 .../test/Analysis/Scalable/ssaf-src-edit-merge}/bad-args.test | 0 .../conflict-preserves-unrelated-zero-length-insert.test | 0 .../ssaf-src-edit-merge}/conflict-stderr-without-sarif.test | 0 .../test/Analysis/Scalable/ssaf-src-edit-merge}/empty-input.test | 0 .../test/Analysis/Scalable/ssaf-src-edit-merge}/help.test | 0 .../Scalable/ssaf-src-edit-merge}/identical-overlap.test | 0 .../Analysis/Scalable/ssaf-src-edit-merge}/malformed-yaml.test | 0 .../Scalable/ssaf-src-edit-merge}/no-conflict-sarif-empty.test | 0 .../Analysis/Scalable/ssaf-src-edit-merge}/non-overlapping.test | 0 .../Analysis/Scalable/ssaf-src-edit-merge}/order-invariance.test | 0 .../Scalable/ssaf-src-edit-merge}/parent-dir-missing.test | 0 .../pre-dedup-identical-non-zero-length.test | 0 .../ssaf-src-edit-merge}/pre-dedup-zero-length-insert.test | 0 .../range-overlap-cluster-of-three-sarif.test | 0 .../ssaf-src-edit-merge}/range-overlap-conflict-sarif.test | 0 .../ssaf-src-edit-merge}/sarif-out-parent-dir-missing.test | 0 .../ssaf-src-edit-merge}/single-input-internal-conflict.test | 0 .../Analysis/Scalable/ssaf-src-edit-merge}/single-input.test | 0 .../Scalable/ssaf-src-edit-merge}/three-input-all-conflict.test | 0 .../ssaf-src-edit-merge}/three-input-conflict-sarif.test | 0 .../two-conflicts-different-offsets-sarif.test | 0 .../Scalable/ssaf-src-edit-merge}/two-input-conflict-sarif.test | 0 .../Scalable/ssaf-src-edit-merge}/two-input-conflict.test | 0 clang/test/CMakeLists.txt | 1 + clang/tools/CMakeLists.txt | 1 + .../tools}/clang-ssaf-src-edit-merge/CMakeLists.txt | 0 .../tools}/clang-ssaf-src-edit-merge/SrcEditMerge.cpp | 0 43 files changed, 2 insertions(+), 3 deletions(-) delete mode 100644 clang-tools-extra/test/clang-ssaf-src-edit-merge/lit.local.cfg rename {clang-tools-extra/test/clang-ssaf-src-edit-merge => clang/test/Analysis/Scalable/ssaf-src-edit-merge}/Inputs/conflict-text-q-offset-30.tpl.yaml (100%) rename {clang-tools-extra/test/clang-ssaf-src-edit-merge => clang/test/Analysis/Scalable/ssaf-src-edit-merge}/Inputs/conflict-text-y.tpl.yaml (100%) rename {clang-tools-extra/test/clang-ssaf-src-edit-merge => clang/test/Analysis/Scalable/ssaf-src-edit-merge}/Inputs/conflict-text-z.tpl.yaml (100%) rename {clang-tools-extra/test/clang-ssaf-src-edit-merge => clang/test/Analysis/Scalable/ssaf-src-edit-merge}/Inputs/empty.tpl.yaml (100%) rename {clang-tools-extra/test/clang-ssaf-src-edit-merge => clang/test/Analysis/Scalable/ssaf-src-edit-merge}/Inputs/internal-conflict.tpl.yaml (100%) rename {clang-tools-extra/test/clang-ssaf-src-edit-merge => clang/test/Analysis/Scalable/ssaf-src-edit-merge}/Inputs/non-overlapping-a.tpl.yaml (100%) rename {clang-tools-extra/test/clang-ssaf-src-edit-merge => clang/test/Analysis/Scalable/ssaf-src-edit-merge}/Inputs/non-overlapping-b.tpl.yaml (100%) rename {clang-tools-extra/test/clang-ssaf-src-edit-merge => clang/test/Analysis/Scalable/ssaf-src-edit-merge}/Inputs/range-overlap-cluster-of-three.tpl.yaml (100%) rename {clang-tools-extra/test/clang-ssaf-src-edit-merge => clang/test/Analysis/Scalable/ssaf-src-edit-merge}/Inputs/range-overlap-distinct-offsets.tpl.yaml (100%) rename {clang-tools-extra/test/clang-ssaf-src-edit-merge => clang/test/Analysis/Scalable/ssaf-src-edit-merge}/Inputs/single-non-zero-length-replacement.tpl.yaml (100%) rename {clang-tools-extra/test/clang-ssaf-src-edit-merge => clang/test/Analysis/Scalable/ssaf-src-edit-merge}/Inputs/single-replacement-offset-30.tpl.yaml (100%) rename {clang-tools-extra/test/clang-ssaf-src-edit-merge => clang/test/Analysis/Scalable/ssaf-src-edit-merge}/Inputs/single-replacement.tpl.yaml (100%) rename {clang-tools-extra/test/clang-ssaf-src-edit-merge => clang/test/Analysis/Scalable/ssaf-src-edit-merge}/Inputs/single-zero-length-insert.tpl.yaml (100%) rename {clang-tools-extra/test/clang-ssaf-src-edit-merge => clang/test/Analysis/Scalable/ssaf-src-edit-merge}/bad-args.test (100%) rename {clang-tools-extra/test/clang-ssaf-src-edit-merge => clang/test/Analysis/Scalable/ssaf-src-edit-merge}/conflict-preserves-unrelated-zero-length-insert.test (100%) rename {clang-tools-extra/test/clang-ssaf-src-edit-merge => clang/test/Analysis/Scalable/ssaf-src-edit-merge}/conflict-stderr-without-sarif.test (100%) rename {clang-tools-extra/test/clang-ssaf-src-edit-merge => clang/test/Analysis/Scalable/ssaf-src-edit-merge}/empty-input.test (100%) rename {clang-tools-extra/test/clang-ssaf-src-edit-merge => clang/test/Analysis/Scalable/ssaf-src-edit-merge}/help.test (100%) rename {clang-tools-extra/test/clang-ssaf-src-edit-merge => clang/test/Analysis/Scalable/ssaf-src-edit-merge}/identical-overlap.test (100%) rename {clang-tools-extra/test/clang-ssaf-src-edit-merge => clang/test/Analysis/Scalable/ssaf-src-edit-merge}/malformed-yaml.test (100%) rename {clang-tools-extra/test/clang-ssaf-src-edit-merge => clang/test/Analysis/Scalable/ssaf-src-edit-merge}/no-conflict-sarif-empty.test (100%) rename {clang-tools-extra/test/clang-ssaf-src-edit-merge => clang/test/Analysis/Scalable/ssaf-src-edit-merge}/non-overlapping.test (100%) rename {clang-tools-extra/test/clang-ssaf-src-edit-merge => clang/test/Analysis/Scalable/ssaf-src-edit-merge}/order-invariance.test (100%) rename {clang-tools-extra/test/clang-ssaf-src-edit-merge => clang/test/Analysis/Scalable/ssaf-src-edit-merge}/parent-dir-missing.test (100%) rename {clang-tools-extra/test/clang-ssaf-src-edit-merge => clang/test/Analysis/Scalable/ssaf-src-edit-merge}/pre-dedup-identical-non-zero-length.test (100%) rename {clang-tools-extra/test/clang-ssaf-src-edit-merge => clang/test/Analysis/Scalable/ssaf-src-edit-merge}/pre-dedup-zero-length-insert.test (100%) rename {clang-tools-extra/test/clang-ssaf-src-edit-merge => clang/test/Analysis/Scalable/ssaf-src-edit-merge}/range-overlap-cluster-of-three-sarif.test (100%) rename {clang-tools-extra/test/clang-ssaf-src-edit-merge => clang/test/Analysis/Scalable/ssaf-src-edit-merge}/range-overlap-conflict-sarif.test (100%) rename {clang-tools-extra/test/clang-ssaf-src-edit-merge => clang/test/Analysis/Scalable/ssaf-src-edit-merge}/sarif-out-parent-dir-missing.test (100%) rename {clang-tools-extra/test/clang-ssaf-src-edit-merge => clang/test/Analysis/Scalable/ssaf-src-edit-merge}/single-input-internal-conflict.test (100%) rename {clang-tools-extra/test/clang-ssaf-src-edit-merge => clang/test/Analysis/Scalable/ssaf-src-edit-merge}/single-input.test (100%) rename {clang-tools-extra/test/clang-ssaf-src-edit-merge => clang/test/Analysis/Scalable/ssaf-src-edit-merge}/three-input-all-conflict.test (100%) rename {clang-tools-extra/test/clang-ssaf-src-edit-merge => clang/test/Analysis/Scalable/ssaf-src-edit-merge}/three-input-conflict-sarif.test (100%) rename {clang-tools-extra/test/clang-ssaf-src-edit-merge => clang/test/Analysis/Scalable/ssaf-src-edit-merge}/two-conflicts-different-offsets-sarif.test (100%) rename {clang-tools-extra/test/clang-ssaf-src-edit-merge => clang/test/Analysis/Scalable/ssaf-src-edit-merge}/two-input-conflict-sarif.test (100%) rename {clang-tools-extra/test/clang-ssaf-src-edit-merge => clang/test/Analysis/Scalable/ssaf-src-edit-merge}/two-input-conflict.test (100%) rename {clang-tools-extra => clang/tools}/clang-ssaf-src-edit-merge/CMakeLists.txt (100%) rename {clang-tools-extra => clang/tools}/clang-ssaf-src-edit-merge/SrcEditMerge.cpp (100%) diff --git a/clang-tools-extra/CMakeLists.txt b/clang-tools-extra/CMakeLists.txt index 291e130ca3901..89e89195277b0 100644 --- a/clang-tools-extra/CMakeLists.txt +++ b/clang-tools-extra/CMakeLists.txt @@ -29,7 +29,6 @@ add_subdirectory(clang-doc) add_subdirectory(clang-include-fixer) add_subdirectory(clang-move) add_subdirectory(clang-query) -add_subdirectory(clang-ssaf-src-edit-merge) add_subdirectory(include-cleaner) add_subdirectory(pp-trace) add_subdirectory(tool-template) diff --git a/clang-tools-extra/test/CMakeLists.txt b/clang-tools-extra/test/CMakeLists.txt index 49794ff5111a3..22f227a891f82 100644 --- a/clang-tools-extra/test/CMakeLists.txt +++ b/clang-tools-extra/test/CMakeLists.txt @@ -33,7 +33,6 @@ set(CLANG_TOOLS_TEST_DEPS clang-move clang-query clang-reorder-fields - clang-ssaf-src-edit-merge find-all-symbols modularize pp-trace diff --git a/clang-tools-extra/test/clang-ssaf-src-edit-merge/lit.local.cfg b/clang-tools-extra/test/clang-ssaf-src-edit-merge/lit.local.cfg deleted file mode 100644 index 0ed7eee8f8bf4..0000000000000 --- a/clang-tools-extra/test/clang-ssaf-src-edit-merge/lit.local.cfg +++ /dev/null @@ -1 +0,0 @@ -config.suffixes = [".test"] diff --git a/clang-tools-extra/test/clang-ssaf-src-edit-merge/Inputs/conflict-text-q-offset-30.tpl.yaml b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/Inputs/conflict-text-q-offset-30.tpl.yaml similarity index 100% rename from clang-tools-extra/test/clang-ssaf-src-edit-merge/Inputs/conflict-text-q-offset-30.tpl.yaml rename to clang/test/Analysis/Scalable/ssaf-src-edit-merge/Inputs/conflict-text-q-offset-30.tpl.yaml diff --git a/clang-tools-extra/test/clang-ssaf-src-edit-merge/Inputs/conflict-text-y.tpl.yaml b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/Inputs/conflict-text-y.tpl.yaml similarity index 100% rename from clang-tools-extra/test/clang-ssaf-src-edit-merge/Inputs/conflict-text-y.tpl.yaml rename to clang/test/Analysis/Scalable/ssaf-src-edit-merge/Inputs/conflict-text-y.tpl.yaml diff --git a/clang-tools-extra/test/clang-ssaf-src-edit-merge/Inputs/conflict-text-z.tpl.yaml b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/Inputs/conflict-text-z.tpl.yaml similarity index 100% rename from clang-tools-extra/test/clang-ssaf-src-edit-merge/Inputs/conflict-text-z.tpl.yaml rename to clang/test/Analysis/Scalable/ssaf-src-edit-merge/Inputs/conflict-text-z.tpl.yaml diff --git a/clang-tools-extra/test/clang-ssaf-src-edit-merge/Inputs/empty.tpl.yaml b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/Inputs/empty.tpl.yaml similarity index 100% rename from clang-tools-extra/test/clang-ssaf-src-edit-merge/Inputs/empty.tpl.yaml rename to clang/test/Analysis/Scalable/ssaf-src-edit-merge/Inputs/empty.tpl.yaml diff --git a/clang-tools-extra/test/clang-ssaf-src-edit-merge/Inputs/internal-conflict.tpl.yaml b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/Inputs/internal-conflict.tpl.yaml similarity index 100% rename from clang-tools-extra/test/clang-ssaf-src-edit-merge/Inputs/internal-conflict.tpl.yaml rename to clang/test/Analysis/Scalable/ssaf-src-edit-merge/Inputs/internal-conflict.tpl.yaml diff --git a/clang-tools-extra/test/clang-ssaf-src-edit-merge/Inputs/non-overlapping-a.tpl.yaml b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/Inputs/non-overlapping-a.tpl.yaml similarity index 100% rename from clang-tools-extra/test/clang-ssaf-src-edit-merge/Inputs/non-overlapping-a.tpl.yaml rename to clang/test/Analysis/Scalable/ssaf-src-edit-merge/Inputs/non-overlapping-a.tpl.yaml diff --git a/clang-tools-extra/test/clang-ssaf-src-edit-merge/Inputs/non-overlapping-b.tpl.yaml b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/Inputs/non-overlapping-b.tpl.yaml similarity index 100% rename from clang-tools-extra/test/clang-ssaf-src-edit-merge/Inputs/non-overlapping-b.tpl.yaml rename to clang/test/Analysis/Scalable/ssaf-src-edit-merge/Inputs/non-overlapping-b.tpl.yaml diff --git a/clang-tools-extra/test/clang-ssaf-src-edit-merge/Inputs/range-overlap-cluster-of-three.tpl.yaml b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/Inputs/range-overlap-cluster-of-three.tpl.yaml similarity index 100% rename from clang-tools-extra/test/clang-ssaf-src-edit-merge/Inputs/range-overlap-cluster-of-three.tpl.yaml rename to clang/test/Analysis/Scalable/ssaf-src-edit-merge/Inputs/range-overlap-cluster-of-three.tpl.yaml diff --git a/clang-tools-extra/test/clang-ssaf-src-edit-merge/Inputs/range-overlap-distinct-offsets.tpl.yaml b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/Inputs/range-overlap-distinct-offsets.tpl.yaml similarity index 100% rename from clang-tools-extra/test/clang-ssaf-src-edit-merge/Inputs/range-overlap-distinct-offsets.tpl.yaml rename to clang/test/Analysis/Scalable/ssaf-src-edit-merge/Inputs/range-overlap-distinct-offsets.tpl.yaml diff --git a/clang-tools-extra/test/clang-ssaf-src-edit-merge/Inputs/single-non-zero-length-replacement.tpl.yaml b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/Inputs/single-non-zero-length-replacement.tpl.yaml similarity index 100% rename from clang-tools-extra/test/clang-ssaf-src-edit-merge/Inputs/single-non-zero-length-replacement.tpl.yaml rename to clang/test/Analysis/Scalable/ssaf-src-edit-merge/Inputs/single-non-zero-length-replacement.tpl.yaml diff --git a/clang-tools-extra/test/clang-ssaf-src-edit-merge/Inputs/single-replacement-offset-30.tpl.yaml b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/Inputs/single-replacement-offset-30.tpl.yaml similarity index 100% rename from clang-tools-extra/test/clang-ssaf-src-edit-merge/Inputs/single-replacement-offset-30.tpl.yaml rename to clang/test/Analysis/Scalable/ssaf-src-edit-merge/Inputs/single-replacement-offset-30.tpl.yaml diff --git a/clang-tools-extra/test/clang-ssaf-src-edit-merge/Inputs/single-replacement.tpl.yaml b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/Inputs/single-replacement.tpl.yaml similarity index 100% rename from clang-tools-extra/test/clang-ssaf-src-edit-merge/Inputs/single-replacement.tpl.yaml rename to clang/test/Analysis/Scalable/ssaf-src-edit-merge/Inputs/single-replacement.tpl.yaml diff --git a/clang-tools-extra/test/clang-ssaf-src-edit-merge/Inputs/single-zero-length-insert.tpl.yaml b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/Inputs/single-zero-length-insert.tpl.yaml similarity index 100% rename from clang-tools-extra/test/clang-ssaf-src-edit-merge/Inputs/single-zero-length-insert.tpl.yaml rename to clang/test/Analysis/Scalable/ssaf-src-edit-merge/Inputs/single-zero-length-insert.tpl.yaml diff --git a/clang-tools-extra/test/clang-ssaf-src-edit-merge/bad-args.test b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/bad-args.test similarity index 100% rename from clang-tools-extra/test/clang-ssaf-src-edit-merge/bad-args.test rename to clang/test/Analysis/Scalable/ssaf-src-edit-merge/bad-args.test diff --git a/clang-tools-extra/test/clang-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 similarity index 100% rename from clang-tools-extra/test/clang-ssaf-src-edit-merge/conflict-preserves-unrelated-zero-length-insert.test rename to clang/test/Analysis/Scalable/ssaf-src-edit-merge/conflict-preserves-unrelated-zero-length-insert.test diff --git a/clang-tools-extra/test/clang-ssaf-src-edit-merge/conflict-stderr-without-sarif.test b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/conflict-stderr-without-sarif.test similarity index 100% rename from clang-tools-extra/test/clang-ssaf-src-edit-merge/conflict-stderr-without-sarif.test rename to clang/test/Analysis/Scalable/ssaf-src-edit-merge/conflict-stderr-without-sarif.test diff --git a/clang-tools-extra/test/clang-ssaf-src-edit-merge/empty-input.test b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/empty-input.test similarity index 100% rename from clang-tools-extra/test/clang-ssaf-src-edit-merge/empty-input.test rename to clang/test/Analysis/Scalable/ssaf-src-edit-merge/empty-input.test diff --git a/clang-tools-extra/test/clang-ssaf-src-edit-merge/help.test b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/help.test similarity index 100% rename from clang-tools-extra/test/clang-ssaf-src-edit-merge/help.test rename to clang/test/Analysis/Scalable/ssaf-src-edit-merge/help.test diff --git a/clang-tools-extra/test/clang-ssaf-src-edit-merge/identical-overlap.test b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/identical-overlap.test similarity index 100% rename from clang-tools-extra/test/clang-ssaf-src-edit-merge/identical-overlap.test rename to clang/test/Analysis/Scalable/ssaf-src-edit-merge/identical-overlap.test diff --git a/clang-tools-extra/test/clang-ssaf-src-edit-merge/malformed-yaml.test b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/malformed-yaml.test similarity index 100% rename from clang-tools-extra/test/clang-ssaf-src-edit-merge/malformed-yaml.test rename to clang/test/Analysis/Scalable/ssaf-src-edit-merge/malformed-yaml.test diff --git a/clang-tools-extra/test/clang-ssaf-src-edit-merge/no-conflict-sarif-empty.test b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/no-conflict-sarif-empty.test similarity index 100% rename from clang-tools-extra/test/clang-ssaf-src-edit-merge/no-conflict-sarif-empty.test rename to clang/test/Analysis/Scalable/ssaf-src-edit-merge/no-conflict-sarif-empty.test diff --git a/clang-tools-extra/test/clang-ssaf-src-edit-merge/non-overlapping.test b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/non-overlapping.test similarity index 100% rename from clang-tools-extra/test/clang-ssaf-src-edit-merge/non-overlapping.test rename to clang/test/Analysis/Scalable/ssaf-src-edit-merge/non-overlapping.test diff --git a/clang-tools-extra/test/clang-ssaf-src-edit-merge/order-invariance.test b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/order-invariance.test similarity index 100% rename from clang-tools-extra/test/clang-ssaf-src-edit-merge/order-invariance.test rename to clang/test/Analysis/Scalable/ssaf-src-edit-merge/order-invariance.test diff --git a/clang-tools-extra/test/clang-ssaf-src-edit-merge/parent-dir-missing.test b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/parent-dir-missing.test similarity index 100% rename from clang-tools-extra/test/clang-ssaf-src-edit-merge/parent-dir-missing.test rename to clang/test/Analysis/Scalable/ssaf-src-edit-merge/parent-dir-missing.test diff --git a/clang-tools-extra/test/clang-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 similarity index 100% rename from clang-tools-extra/test/clang-ssaf-src-edit-merge/pre-dedup-identical-non-zero-length.test rename to clang/test/Analysis/Scalable/ssaf-src-edit-merge/pre-dedup-identical-non-zero-length.test diff --git a/clang-tools-extra/test/clang-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 similarity index 100% rename from clang-tools-extra/test/clang-ssaf-src-edit-merge/pre-dedup-zero-length-insert.test rename to clang/test/Analysis/Scalable/ssaf-src-edit-merge/pre-dedup-zero-length-insert.test diff --git a/clang-tools-extra/test/clang-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 similarity index 100% rename from clang-tools-extra/test/clang-ssaf-src-edit-merge/range-overlap-cluster-of-three-sarif.test rename to clang/test/Analysis/Scalable/ssaf-src-edit-merge/range-overlap-cluster-of-three-sarif.test diff --git a/clang-tools-extra/test/clang-ssaf-src-edit-merge/range-overlap-conflict-sarif.test b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/range-overlap-conflict-sarif.test similarity index 100% rename from clang-tools-extra/test/clang-ssaf-src-edit-merge/range-overlap-conflict-sarif.test rename to clang/test/Analysis/Scalable/ssaf-src-edit-merge/range-overlap-conflict-sarif.test diff --git a/clang-tools-extra/test/clang-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 similarity index 100% rename from clang-tools-extra/test/clang-ssaf-src-edit-merge/sarif-out-parent-dir-missing.test rename to clang/test/Analysis/Scalable/ssaf-src-edit-merge/sarif-out-parent-dir-missing.test diff --git a/clang-tools-extra/test/clang-ssaf-src-edit-merge/single-input-internal-conflict.test b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/single-input-internal-conflict.test similarity index 100% rename from clang-tools-extra/test/clang-ssaf-src-edit-merge/single-input-internal-conflict.test rename to clang/test/Analysis/Scalable/ssaf-src-edit-merge/single-input-internal-conflict.test diff --git a/clang-tools-extra/test/clang-ssaf-src-edit-merge/single-input.test b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/single-input.test similarity index 100% rename from clang-tools-extra/test/clang-ssaf-src-edit-merge/single-input.test rename to clang/test/Analysis/Scalable/ssaf-src-edit-merge/single-input.test diff --git a/clang-tools-extra/test/clang-ssaf-src-edit-merge/three-input-all-conflict.test b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/three-input-all-conflict.test similarity index 100% rename from clang-tools-extra/test/clang-ssaf-src-edit-merge/three-input-all-conflict.test rename to clang/test/Analysis/Scalable/ssaf-src-edit-merge/three-input-all-conflict.test diff --git a/clang-tools-extra/test/clang-ssaf-src-edit-merge/three-input-conflict-sarif.test b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/three-input-conflict-sarif.test similarity index 100% rename from clang-tools-extra/test/clang-ssaf-src-edit-merge/three-input-conflict-sarif.test rename to clang/test/Analysis/Scalable/ssaf-src-edit-merge/three-input-conflict-sarif.test diff --git a/clang-tools-extra/test/clang-ssaf-src-edit-merge/two-conflicts-different-offsets-sarif.test b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/two-conflicts-different-offsets-sarif.test similarity index 100% rename from clang-tools-extra/test/clang-ssaf-src-edit-merge/two-conflicts-different-offsets-sarif.test rename to clang/test/Analysis/Scalable/ssaf-src-edit-merge/two-conflicts-different-offsets-sarif.test diff --git a/clang-tools-extra/test/clang-ssaf-src-edit-merge/two-input-conflict-sarif.test b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/two-input-conflict-sarif.test similarity index 100% rename from clang-tools-extra/test/clang-ssaf-src-edit-merge/two-input-conflict-sarif.test rename to clang/test/Analysis/Scalable/ssaf-src-edit-merge/two-input-conflict-sarif.test diff --git a/clang-tools-extra/test/clang-ssaf-src-edit-merge/two-input-conflict.test b/clang/test/Analysis/Scalable/ssaf-src-edit-merge/two-input-conflict.test similarity index 100% rename from clang-tools-extra/test/clang-ssaf-src-edit-merge/two-input-conflict.test rename to clang/test/Analysis/Scalable/ssaf-src-edit-merge/two-input-conflict.test diff --git a/clang/test/CMakeLists.txt b/clang/test/CMakeLists.txt index 97d5992d803c5..304497490a3dc 100644 --- a/clang/test/CMakeLists.txt +++ b/clang/test/CMakeLists.txt @@ -107,6 +107,7 @@ list(APPEND CLANG_TEST_DEPS clang-ssaf-analyzer clang-ssaf-format clang-ssaf-linker + clang-ssaf-src-edit-merge clang-sycl-linker diagtool hmaptool diff --git a/clang/tools/CMakeLists.txt b/clang/tools/CMakeLists.txt index a16089be041bf..855af780d4e02 100644 --- a/clang/tools/CMakeLists.txt +++ b/clang/tools/CMakeLists.txt @@ -18,6 +18,7 @@ add_clang_subdirectory(clang-scan-deps) add_clang_subdirectory(clang-ssaf-analyzer) add_clang_subdirectory(clang-ssaf-format) add_clang_subdirectory(clang-ssaf-linker) +add_clang_subdirectory(clang-ssaf-src-edit-merge) add_clang_subdirectory(clang-sycl-linker) add_clang_subdirectory(clang-installapi) if(HAVE_CLANG_REPL_SUPPORT) diff --git a/clang-tools-extra/clang-ssaf-src-edit-merge/CMakeLists.txt b/clang/tools/clang-ssaf-src-edit-merge/CMakeLists.txt similarity index 100% rename from clang-tools-extra/clang-ssaf-src-edit-merge/CMakeLists.txt rename to clang/tools/clang-ssaf-src-edit-merge/CMakeLists.txt diff --git a/clang-tools-extra/clang-ssaf-src-edit-merge/SrcEditMerge.cpp b/clang/tools/clang-ssaf-src-edit-merge/SrcEditMerge.cpp similarity index 100% rename from clang-tools-extra/clang-ssaf-src-edit-merge/SrcEditMerge.cpp rename to clang/tools/clang-ssaf-src-edit-merge/SrcEditMerge.cpp _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
