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

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@203446 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/Index/preamble-reparse-warn-end-of-file.c b/test/Index/preamble-reparse-warn-end-of-file.c
index 07e4919e437c34296ef735b2212ba8473925e670..c2ae892fbc625aef8c748a04e1cf83af9fac622b 100644 (file)
--- a/test/Index/preamble-reparse-warn-end-of-file.c
+++ b/test/Index/preamble-reparse-warn-end-of-file.c
@@ -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"
 

diff --git a/test/Index/preamble-reparse-warn-macro.c b/test/Index/preamble-reparse-warn-macro.c
index de4c003bdf3e262fe6680d7bd718e327e1374efb..e02fbde78403683789c0c922c24c8fcebaaaa02e 100644 (file)
--- a/test/Index/preamble-reparse-warn-macro.c
+++ b/test/Index/preamble-reparse-warn-macro.c
@@ -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