From 35639de1816ac3e64b9a74cf8f269ca91330d620 Mon Sep 17 00:00:00 2001 From: Benjamin Kramer Date: Tue, 9 Jun 2015 12:41:02 +0000 Subject: [PATCH] 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 --- test/Format/style-on-command-line.cpp | 4 +--- 1 file changed, 1 insertion(+), 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 -- 2.40.0