summaryrefslogtreecommitdiff
path: root/test/Format
diff options
context:
space:
mode:
authorBenjamin Kramer <benny.kra@googlemail.com>2015-06-09 12:41:02 +0000
committerBenjamin Kramer <benny.kra@googlemail.com>2015-06-09 12:41:02 +0000
commit35639de1816ac3e64b9a74cf8f269ca91330d620 (patch)
tree2ca45751799c8896a2567b287464eed7f64e7bb5 /test/Format
parent7674334aa5726cbf083be88da2a1332d93933841 (diff)
downloadclang-35639de1816ac3e64b9a74cf8f269ca91330d620.tar.gz
Remove rm invocations where the file is immediately rewritten later.
This may or may not help making this test less flaky on windows. There's a race condition in lit somewhere. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@239402 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/Format')
-rw-r--r--test/Format/style-on-command-line.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/test/Format/style-on-command-line.cpp b/test/Format/style-on-command-line.cpp
index 69c54b2b63..2e757cc92a 100644
--- a/test/Format/style-on-command-line.cpp
+++ b/test/Format/style-on-command-line.cpp
@@ -3,13 +3,11 @@
// 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 %t.cpp 2>&1 | FileCheck -strict-whitespace -check-prefix=CHECK3 %s
// RUN: clang-format -style="{lsjd}" %t.cpp -fallback-style=LLVM 2>&1 | FileCheck -strict-whitespace -check-prefix=CHECK4 %s
-// RUN: [ ! -e %T/.clang-format ] || rm %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: 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: [ ! -e %T/.clang-format ] || rm %T/.clang-format
-// RUN: [ ! -e %T/_clang-format ] || rm %T/_clang-format
+// RUN: rm %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="{BasedOnStyle: LLVM, PointerBindsToType: true}" %t.cpp | FileCheck -strict-whitespace -check-prefix=CHECK8 %s