summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel E. Denny <jdenny.ornl@gmail.com>2019-10-16 23:58:58 +0000
committerJoel E. Denny <jdenny.ornl@gmail.com>2019-10-16 23:58:58 +0000
commitd3dd489b9a6f7c578ea461507d29b351e93f6172 (patch)
treeb412b45b7a469c517d647aecd18b1050a4f17a73
parentec5208fd65668ec6415eb274294d284835f3d5dd (diff)
downloadbcm5719-llvm-d3dd489b9a6f7c578ea461507d29b351e93f6172.tar.gz
bcm5719-llvm-d3dd489b9a6f7c578ea461507d29b351e93f6172.zip
[lit] Fix another test case that r374652 missed
llvm-svn: 375058
-rw-r--r--clang-tools-extra/test/clang-include-fixer/merge.test2
1 files changed, 1 insertions, 1 deletions
diff --git a/clang-tools-extra/test/clang-include-fixer/merge.test b/clang-tools-extra/test/clang-include-fixer/merge.test
index 75b4d6e6261..6e65e518be4 100644
--- a/clang-tools-extra/test/clang-include-fixer/merge.test
+++ b/clang-tools-extra/test/clang-include-fixer/merge.test
@@ -1,6 +1,6 @@
# RUN: find-all-symbols -merge-dir=%S/Inputs/merge %t.merged
# RUN: sed '/^#/d' %s > %t.golden
-# RUN: diff -u %t.golden %t.merged
+# RUN: diff --strip-trailing-cr -u %t.golden %t.merged
---
Name: bar
Contexts:
OpenPOWER on IntegriCloud