Skip to content

Commit d3ac676

Browse files
authored
[clang-format][NFC] Use FileCheck for clang-format-ignore lit test (#77977)
1 parent b0aebbd commit d3ac676

File tree

1 file changed

+25
-21
lines changed

1 file changed

+25
-21
lines changed

clang/test/Format/clang-format-ignore.cpp

Lines changed: 25 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,41 +7,45 @@
77
// RUN: echo "level*/*.c*" >> .clang-format-ignore
88
// RUN: echo "*/*2/foo.*" >> .clang-format-ignore
99
// RUN: touch foo.cc
10-
// RUN: clang-format -verbose .clang-format-ignore foo.cc 2> %t.stderr
11-
// RUN: not grep Formatting %t.stderr
10+
// RUN: clang-format -verbose .clang-format-ignore foo.cc 2>&1 \
11+
// RUN: | FileCheck %s -allow-empty
1212

1313
// RUN: cd level1
1414
// RUN: touch bar.cc baz.c
15-
// RUN: clang-format -verbose bar.cc baz.c 2> %t.stderr
16-
// RUN: not grep Formatting %t.stderr
15+
// RUN: clang-format -verbose bar.cc baz.c 2>&1 | FileCheck %s -allow-empty
1716

1817
// RUN: cd level2
1918
// RUN: touch foo.c foo.js
20-
// RUN: clang-format -verbose foo.c foo.js 2> %t.stderr
21-
// RUN: not grep Formatting %t.stderr
19+
// RUN: clang-format -verbose foo.c foo.js 2>&1 | FileCheck %s -allow-empty
20+
21+
// CHECK-NOT: Formatting
2222

2323
// RUN: touch .clang-format-ignore
24-
// RUN: clang-format -verbose foo.c foo.js 2> %t.stderr
25-
// RUN: grep -Fx "Formatting [1/2] foo.c" %t.stderr
26-
// RUN: grep -Fx "Formatting [2/2] foo.js" %t.stderr
24+
// RUN: clang-format -verbose foo.c foo.js 2>&1 \
25+
// RUN: | FileCheck %s -check-prefix=CHECK2 -match-full-lines
26+
// CHECK2: Formatting [1/2] foo.c
27+
// CHECK2-NEXT: Formatting [2/2] foo.js
2728

2829
// RUN: echo "*.js" > .clang-format-ignore
29-
// RUN: clang-format -verbose foo.c foo.js 2> %t.stderr
30-
// RUN: grep -Fx "Formatting [1/2] foo.c" %t.stderr
31-
// RUN: not grep -F foo.js %t.stderr
30+
// RUN: clang-format -verbose foo.c foo.js 2>&1 \
31+
// RUN: | FileCheck %s -check-prefix=CHECK3 -match-full-lines
32+
// CHECK3: Formatting [1/2] foo.c
33+
// CHECK3-NOT: foo.js
3234

3335
// RUN: cd ../..
34-
// RUN: clang-format -verbose *.cc level1/*.c* level1/level2/foo.* 2> %t.stderr
35-
// RUN: grep -x "Formatting \[1/5] .*foo\.c" %t.stderr
36-
// RUN: not grep -F foo.js %t.stderr
36+
// RUN: clang-format -verbose *.cc level1/*.c* level1/level2/foo.* 2>&1 \
37+
// RUN: | FileCheck %s -check-prefix=CHECK4 -match-full-lines
38+
// CHECK4: {{Formatting \[1/5] .*foo\.c}}
39+
// CHECK4-NOT: foo.js
3740

3841
// RUN: rm .clang-format-ignore
39-
// RUN: clang-format -verbose *.cc level1/*.c* level1/level2/foo.* 2> %t.stderr
40-
// RUN: grep -x "Formatting \[1/5] .*foo\.cc" %t.stderr
41-
// RUN: grep -x "Formatting \[2/5] .*bar\.cc" %t.stderr
42-
// RUN: grep -x "Formatting \[3/5] .*baz\.c" %t.stderr
43-
// RUN: grep -x "Formatting \[4/5] .*foo\.c" %t.stderr
44-
// RUN: not grep -F foo.js %t.stderr
42+
// RUN: clang-format -verbose *.cc level1/*.c* level1/level2/foo.* 2>&1 \
43+
// RUN: | FileCheck %s -check-prefix=CHECK5 -match-full-lines
44+
// CHECK5: {{Formatting \[1/5] .*foo\.cc}}
45+
// CHECK5-NEXT: {{Formatting \[2/5] .*bar\.cc}}
46+
// CHECK5-NEXT: {{Formatting \[3/5] .*baz\.c}}
47+
// CHECK5-NEXT: {{Formatting \[4/5] .*foo\.c}}
48+
// CHECK5-NOT: foo.js
4549

4650
// RUN: cd ..
4751
// RUN: rm -r %t.dir

0 commit comments

Comments
 (0)