summaryrefslogtreecommitdiffstats
path: root/clang-tools-extra/test/clang-replace/conflict.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'clang-tools-extra/test/clang-replace/conflict.cpp')
-rw-r--r--clang-tools-extra/test/clang-replace/conflict.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/clang-tools-extra/test/clang-replace/conflict.cpp b/clang-tools-extra/test/clang-replace/conflict.cpp
new file mode 100644
index 00000000000..5b79401fc09
--- /dev/null
+++ b/clang-tools-extra/test/clang-replace/conflict.cpp
@@ -0,0 +1,7 @@
+// RUN: mkdir -p %T/conflict
+// RUN: sed "s#\$(path)#%/S/conflict#" %S/conflict/file1.yaml > %T/conflict/file1.yaml
+// RUN: sed "s#\$(path)#%/S/conflict#" %S/conflict/file2.yaml > %T/conflict/file2.yaml
+// RUN: sed "s#\$(path)#%/S/conflict#" %S/conflict/file3.yaml > %T/conflict/file3.yaml
+// RUN: sed "s#\$(path)#%/S/conflict#" %S/conflict/expected.txt > %T/conflict/expected.txt
+// RUN: not clang-replace %T/conflict > %T/conflict/output.txt 2>&1
+// RUN: diff -b %T/conflict/output.txt %T/conflict/expected.txt
OpenPOWER on IntegriCloud