https://github.com/owenca created https://github.com/llvm/llvm-project/pull/77977
None >From 4f516c1ee4ab99af2c3135ca161a82e6428d3ee9 Mon Sep 17 00:00:00 2001 From: Owen Pan <owenpi...@gmail.com> Date: Fri, 12 Jan 2024 12:30:17 -0800 Subject: [PATCH] [clang-format][NFC] Use FileCheck for clang-format-ignore lit test --- clang/test/Format/clang-format-ignore.cpp | 46 ++++++++++++----------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/clang/test/Format/clang-format-ignore.cpp b/clang/test/Format/clang-format-ignore.cpp index 5a2267b302d22f..fb49fa9dd52c65 100644 --- a/clang/test/Format/clang-format-ignore.cpp +++ b/clang/test/Format/clang-format-ignore.cpp @@ -6,41 +6,45 @@ // RUN: echo "level*/*.c*" >> .clang-format-ignore // RUN: echo "*/*2/foo.*" >> .clang-format-ignore // RUN: touch foo.cc -// RUN: clang-format -verbose .clang-format-ignore foo.cc 2> %t.stderr -// RUN: not grep Formatting %t.stderr +// RUN: clang-format -verbose .clang-format-ignore foo.cc 2>&1 \ +// RUN: | FileCheck %s -allow-empty // RUN: cd level1 // RUN: touch bar.cc baz.c -// RUN: clang-format -verbose bar.cc baz.c 2> %t.stderr -// RUN: not grep Formatting %t.stderr +// RUN: clang-format -verbose bar.cc baz.c 2>&1 | FileCheck %s -allow-empty // RUN: cd level2 // RUN: touch foo.c foo.js -// RUN: clang-format -verbose foo.c foo.js 2> %t.stderr -// RUN: not grep Formatting %t.stderr +// RUN: clang-format -verbose foo.c foo.js 2>&1 | FileCheck %s -allow-empty + +// CHECK-NOT: Formatting // RUN: touch .clang-format-ignore -// RUN: clang-format -verbose foo.c foo.js 2> %t.stderr -// RUN: grep -Fx "Formatting [1/2] foo.c" %t.stderr -// RUN: grep -Fx "Formatting [2/2] foo.js" %t.stderr +// RUN: clang-format -verbose foo.c foo.js 2>&1 \ +// RUN: | FileCheck %s -check-prefix=CHECK2 -match-full-lines +// CHECK2: Formatting [1/2] foo.c +// CHECK2-NEXT: Formatting [2/2] foo.js // RUN: echo "*.js" > .clang-format-ignore -// RUN: clang-format -verbose foo.c foo.js 2> %t.stderr -// RUN: grep -Fx "Formatting [1/2] foo.c" %t.stderr -// RUN: not grep -F foo.js %t.stderr +// RUN: clang-format -verbose foo.c foo.js 2>&1 \ +// RUN: | FileCheck %s -check-prefix=CHECK3 -match-full-lines +// CHECK3: Formatting [1/2] foo.c +// CHECK3-NOT: foo.js // RUN: cd ../.. -// RUN: clang-format -verbose *.cc level1/*.c* level1/level2/foo.* 2> %t.stderr -// RUN: grep -x "Formatting \[1/5] .*foo\.c" %t.stderr -// RUN: not grep -F foo.js %t.stderr +// RUN: clang-format -verbose *.cc level1/*.c* level1/level2/foo.* 2>&1 \ +// RUN: | FileCheck %s -check-prefix=CHECK4 -match-full-lines +// CHECK4: {{Formatting \[1/5] .*foo\.c}} +// CHECK4-NOT: foo.js // RUN: rm .clang-format-ignore -// RUN: clang-format -verbose *.cc level1/*.c* level1/level2/foo.* 2> %t.stderr -// RUN: grep -x "Formatting \[1/5] .*foo\.cc" %t.stderr -// RUN: grep -x "Formatting \[2/5] .*bar\.cc" %t.stderr -// RUN: grep -x "Formatting \[3/5] .*baz\.c" %t.stderr -// RUN: grep -x "Formatting \[4/5] .*foo\.c" %t.stderr -// RUN: not grep -F foo.js %t.stderr +// RUN: clang-format -verbose *.cc level1/*.c* level1/level2/foo.* 2>&1 \ +// RUN: | FileCheck %s -check-prefix=CHECK5 -match-full-lines +// CHECK5: {{Formatting \[1/5] .*foo\.cc}} +// CHECK5-NEXT: {{Formatting \[2/5] .*bar\.cc}} +// CHECK5-NEXT: {{Formatting \[3/5] .*baz\.c}} +// CHECK5-NEXT: {{Formatting \[4/5] .*foo\.c}} +// CHECK5-NOT: foo.js // RUN: cd .. // RUN: rm -r %t.dir _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits