r239402 - Remove rm invocations where the file is immediately rewritten later.

[Reid Kleckner]

This came up last week:
http://lists.cs.uiuc.edu/pipermail/cfe-dev/2015-June/043376.html

I just disabled the test in r239416.

On Tue, Jun 9, 2015 at 5:41 AM, Benjamin Kramer <benny.kra at googlemail.com>
wrote:

> Author: d0k
> Date: Tue Jun  9 07:41:02 2015
> New Revision: 239402
>
> URL: http://llvm.org/viewvc/llvm-project?rev=239402&view=rev
> Log:
> 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.
>
> Modified:
>     cfe/trunk/test/Format/style-on-command-line.cpp
>
> Modified: cfe/trunk/test/Format/style-on-command-line.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Format/style-on-command-line.cpp?rev=239402&r1=239401&r2=239402&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/Format/style-on-command-line.cpp (original)
> +++ cfe/trunk/test/Format/style-on-command-line.cpp Tue Jun  9 07:41:02
> 2015
> @@ -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
>
>
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20150609/48839e7f/attachment.html>