r203446 - clang/test/Index/preamble-reparse-warn-*.c: Stabilize on win32.

[NAKAMURA Takumi]

Author: chapuni
Date: Mon Mar 10 01:02:13 2014
New Revision: 203446

URL: http://llvm.org/viewvc/llvm-project?rev=203446&view=rev
Log:
clang/test/Index/preamble-reparse-warn-*.c: Stabilize on win32.

Modified:
    cfe/trunk/test/Index/preamble-reparse-warn-end-of-file.c
    cfe/trunk/test/Index/preamble-reparse-warn-macro.c

Modified: cfe/trunk/test/Index/preamble-reparse-warn-end-of-file.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/preamble-reparse-warn-end-of-file.c?rev=203446&r1=203445&r2=203446&view=diff
==============================================================================
--- cfe/trunk/test/Index/preamble-reparse-warn-end-of-file.c (original)
+++ cfe/trunk/test/Index/preamble-reparse-warn-end-of-file.c Mon Mar 10 01:02:13 2014
@@ -1,11 +1,10 @@
 // RUN: mkdir -p %t
 // RUN: touch %t/header.h
-// RUN: env CINDEXTEST_EDITING=1 c-index-test -test-load-source-reparse 2 local %s -I %t 2> %t.err.txt > %t.out.txt
-// RUN: cat %t.err.txt >> %t.out.txt
+// RUN: env CINDEXTEST_EDITING=1 c-index-test -test-load-source-reparse 2 local %s -I %t 2>&1 > %t.out.txt | FileCheck -check-prefix=STDERR %s
 // RUN: FileCheck -input-file=%t.out.txt %s
 // CHECK: preamble-reparse-warn-end-of-file.c:[[@LINE+6]]:6: FunctionDecl=test:[[@LINE+6]]:6
-// CHECK: preamble-reparse-warn-end-of-file.c:[[@LINE+5]]:14: error: expected '}'
-// CHECK: preamble-reparse-warn-end-of-file.c:[[@LINE+4]]:14: error: expected '}'
+// STDERR: preamble-reparse-warn-end-of-file.c:[[@LINE+5]]:14: error: expected '}'
+// STDERR: preamble-reparse-warn-end-of-file.c:[[@LINE+4]]:14: error: expected '}'
 
 #include "header.h"
 

Modified: cfe/trunk/test/Index/preamble-reparse-warn-macro.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/preamble-reparse-warn-macro.c?rev=203446&r1=203445&r2=203446&view=diff
==============================================================================
--- cfe/trunk/test/Index/preamble-reparse-warn-macro.c (original)
+++ cfe/trunk/test/Index/preamble-reparse-warn-macro.c Mon Mar 10 01:02:13 2014
@@ -1,8 +1,6 @@
 // RUN: mkdir -p %t
 // RUN: touch %t/header.h
-// RUN: env CINDEXTEST_EDITING=1 c-index-test -test-load-source-reparse 2 local %s -I %t 2> %t.err.txt > %t.out.txt
-// RUN: cat %t.err.txt >> %t.out.txt
-// RUN: FileCheck -input-file=%t.out.txt %s
+// RUN: env CINDEXTEST_EDITING=1 c-index-test -test-load-source-reparse 2 local %s -I %t 2>&1 > %t.out.txt | FileCheck %s
 // CHECK: preamble-reparse-warn-macro.c:[[@LINE+8]]:9: warning: 'MAC' macro redefined
 // CHECK-NEXT: Number FIX-ITs = 0
 // CHECK-NEXT: preamble-reparse-warn-macro.c:[[@LINE+2]]:9: note: previous definition is here