This is an archive of the discontinued LLVM Phabricator instance.

Differential D13852

clang-format: Use pipes instead of temporary files for most lit tests.
ClosedPublic

Authored by thakis on Oct 18 2015, 5:58 PM.

Details

Reviewers
klimek
djasper
Summary

This makes the format tests look more like most other FileCheck tests in clang.

The multiple-inputs tests still use temp files, to make sure that the file input code in clang-format stays tested.

Stop stripping out the comment lines in style-on-command-line.cpp as they don't get in the way and it makes the test simpler. Also remove 2>&1s on the tests in that file that don't need it.

Diff Detail

Event Timeline

thakis updated this revision to Diff 37713.Oct 18 2015, 5:58 PM
thakis retitled this revision from to clang-format: Use pipes instead of temporary files for most lit tests..
thakis updated this object.
thakis added a reviewer: djasper.
thakis added a subscriber: cfe-commits.
Herald added a subscriber: klimek. · View Herald TranscriptOct 18 2015, 5:58 PM
klimek accepted this revision.Oct 19 2015, 3:57 AM
klimek added a reviewer: klimek.

I'd slightly prefer if the commands were still on their own line (via escaped newlines if that's possible), but lg.

This revision is now accepted and ready to land.Oct 19 2015, 3:57 AM
thakis closed this revision.Oct 19 2015, 9:23 AM

Landed in r250706 (with rewrapped lines). Thanks!

Revision Contents

Diff 37713

test/Format/basic.cpp

// RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp // RUN: grep -Ev "// *[A-Z-]+:" %s | clang-format -style=LLVM | FileCheck -strict-whitespace %s
// RUN: clang-format -style=LLVM -i %t.cpp
// RUN: FileCheck -strict-whitespace -input-file=%t.cpp %s
// CHECK: {{^int\ \*i;}} // CHECK: {{^int\ \*i;}}
int * i ; int * i ;

test/Format/cursor.cpp

// RUN: grep -Ev "// *[A-Z-]+:" %s > %t2.cpp // RUN: grep -Ev "// *[A-Z-]+:" %s | clang-format -style=LLVM -cursor=6 | FileCheck -strict-whitespace %s
// RUN: clang-format -style=LLVM %t2.cpp -cursor=6 > %t.cpp
// RUN: FileCheck -strict-whitespace -input-file=%t.cpp %s
// CHECK: {{^\{ "Cursor": 4, }} // CHECK: {{^\{ "Cursor": 4, }}
// CHECK: {{^int\ \i;$}} // CHECK: {{^int\ \i;$}}
int i; int i;

test/Format/disable-format.cpp

// RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp // RUN: grep -Ev "// *[A-Z-]+:" %s | clang-format -style=none | FileCheck -strict-whitespace %s
// RUN: clang-format -style=none -i %t.cpp
// RUN: FileCheck -strict-whitespace -input-file=%t.cpp %s
// CHECK: int i; // CHECK: int i;
int i; int i;

test/Format/incomplete.cpp

// RUN: grep -Ev "// *[A-Z-]+:" %s > %t2.cpp // RUN: grep -Ev "// *[A-Z-]+:" %s | clang-format -style=LLVM -cursor=0 | FileCheck -strict-whitespace %s
// RUN: clang-format -style=LLVM %t2.cpp -cursor=0 > %t.cpp
// RUN: FileCheck -strict-whitespace -input-file=%t.cpp %s
// CHECK: {{"IncompleteFormat": true}} // CHECK: {{"IncompleteFormat": true}}
// CHECK: {{^int\ \i;$}} // CHECK: {{^int\ \i;$}}
int i; int i;

test/Format/language-detection.cpp

// RUN: grep -Ev "// *[A-Z0-9_]+:" %s > %t.js // RUN: grep -Ev "// *[A-Z0-9_]+:" %s | clang-format -style=llvm -assume-filename=foo.js | FileCheck -strict-whitespace -check-prefix=CHECK1 %s
// RUN: grep -Ev "// *[A-Z0-9_]+:" %s > %t.cpp // RUN: grep -Ev "// *[A-Z0-9_]+:" %s | clang-format -style=llvm -assume-filename=foo.cpp | FileCheck -strict-whitespace -check-prefix=CHECK2 %s
// RUN: clang-format -style=llvm %t.js | FileCheck -strict-whitespace -check-prefix=CHECK1 %s
// RUN: clang-format -style=llvm %t.cpp | FileCheck -strict-whitespace -check-prefix=CHECK2 %s
// CHECK1: {{^a >>>= b;$}} // CHECK1: {{^a >>>= b;$}}
// CHECK2: {{^a >> >= b;$}} // CHECK2: {{^a >> >= b;$}}
a >>>= b; a >>>= b;

test/Format/line-ranges.cpp

// RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp // RUN: grep -Ev "// *[A-Z-]+:" %s | clang-format -style=LLVM -lines=1:1 -lines=5:5 | FileCheck -strict-whitespace %s
// RUN: clang-format -style=LLVM -lines=1:1 -lines=5:5 -i %t.cpp
// RUN: FileCheck -strict-whitespace -input-file=%t.cpp %s
// CHECK: {{^int\ \*i;$}} // CHECK: {{^int\ \*i;$}}
int*i; int*i;

test/Format/ranges.cpp

// RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp // RUN: grep -Ev "// *[A-Z-]+:" %s | clang-format -style=LLVM -offset=2 -length=0 -offset=28 -length=0 | FileCheck -strict-whitespace %s
// RUN: clang-format -style=LLVM -offset=2 -length=0 -offset=28 -length=0 -i %t.cpp
// RUN: FileCheck -strict-whitespace -input-file=%t.cpp %s
// CHECK: {{^int\ \*i;$}} // CHECK: {{^int\ \*i;$}}
int*i; int*i;

test/Format/style-on-command-line.cpp

// RUN: grep -Ev "// *[A-Z0-9_]+:" %s > %t.cpp // RUN: clang-format -style="{BasedOnStyle: Google, IndentWidth: 8}" %s | FileCheck -strict-whitespace -check-prefix=CHECK1 %s
// RUN: clang-format -style="{BasedOnStyle: Google, IndentWidth: 8}" %t.cpp | FileCheck -strict-whitespace -check-prefix=CHECK1 %s // RUN: clang-format -style="{BasedOnStyle: LLVM, IndentWidth: 7}" %s | FileCheck -strict-whitespace -check-prefix=CHECK2 %s
// RUN: clang-format -style="{BasedOnStyle: LLVM, IndentWidth: 7}" %t.cpp | FileCheck -strict-whitespace -check-prefix=CHECK2 %s // RUN: clang-format -style="{BasedOnStyle: invalid, IndentWidth: 7}" -fallback-style=LLVM %s 2>&1 | FileCheck -strict-whitespace -check-prefix=CHECK3 %s
// RUN: clang-format -style="{BasedOnStyle: invalid, IndentWidth: 7}" -fallback-style=LLVM %t.cpp 2>&1 | FileCheck -strict-whitespace -check-prefix=CHECK3 %s // RUN: clang-format -style="{lsjd}" %s -fallback-style=LLVM 2>&1 | FileCheck -strict-whitespace -check-prefix=CHECK4 %s
// RUN: clang-format -style="{lsjd}" %t.cpp -fallback-style=LLVM 2>&1 | FileCheck -strict-whitespace -check-prefix=CHECK4 %s
// RUN: printf "BasedOnStyle: google\nIndentWidth: 5\n" > %T/.clang-format // RUN: printf "BasedOnStyle: google\nIndentWidth: 5\n" > %T/.clang-format
// RUN: clang-format -style=file %t.cpp 2>&1 | FileCheck -strict-whitespace -check-prefix=CHECK5 %s // RUN: clang-format -style=file -assume-filename=%T/foo.cpp < %s | FileCheck -strict-whitespace -check-prefix=CHECK5 %s
// RUN: printf "\n" > %T/.clang-format // RUN: printf "\n" > %T/.clang-format
// RUN: clang-format -style=file -fallback-style=webkit %t.cpp 2>&1 | FileCheck -strict-whitespace -check-prefix=CHECK6 %s // RUN: clang-format -style=file -fallback-style=webkit -assume-filename=%T/foo.cpp < %s 2>&1 | FileCheck -strict-whitespace -check-prefix=CHECK6 %s
// RUN: rm %T/.clang-format // RUN: rm %T/.clang-format
// RUN: printf "BasedOnStyle: google\nIndentWidth: 6\n" > %T/_clang-format // RUN: printf "BasedOnStyle: google\nIndentWidth: 6\n" > %T/_clang-format
// RUN: clang-format -style=file %t.cpp 2>&1 | FileCheck -strict-whitespace -check-prefix=CHECK7 %s // RUN: clang-format -style=file -assume-filename=%T/foo.cpp < %s | FileCheck -strict-whitespace -check-prefix=CHECK7 %s
// RUN: clang-format -style="{BasedOnStyle: LLVM, PointerBindsToType: true}" %t.cpp | FileCheck -strict-whitespace -check-prefix=CHECK8 %s // RUN: clang-format -style="{BasedOnStyle: LLVM, PointerBindsToType: true}" %s | FileCheck -strict-whitespace -check-prefix=CHECK8 %s
// RUN: clang-format -style="{BasedOnStyle: WebKit, PointerBindsToType: false}" %t.cpp | FileCheck -strict-whitespace -check-prefix=CHECK9 %s // RUN: clang-format -style="{BasedOnStyle: WebKit, PointerBindsToType: false}" %s | FileCheck -strict-whitespace -check-prefix=CHECK9 %s
void f() { void f() {
// CHECK1: {{^ int\* i;$}} // CHECK1: {{^ int\* i;$}}
// CHECK2: {{^ int \*i;$}} // CHECK2: {{^ int \*i;$}}

test/Format/xmloutput.cpp

// RUN: clang-format -output-replacements-xml -sort-includes %s > %t.xml // RUN: clang-format -output-replacements-xml -sort-includes %s | FileCheck -strict-whitespace %s
// RUN: FileCheck -strict-whitespace -input-file=%t.xml %s
// CHECK: <?xml // CHECK: <?xml
// CHECK-NEXT: {{<replacements.*incomplete_format='false'}} // CHECK-NEXT: {{<replacements.*incomplete_format='false'}}