projects / platform / upstream / llvm.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5e9c821)
clang/test/Index/preamble-reparse-warn-*.c: Stabilize on win32.
authorNAKAMURA Takumi <geek4civic@gmail.com>
Mon, 10 Mar 2014 06:02:13 +0000 (06:02 +0000)
committerNAKAMURA Takumi <geek4civic@gmail.com>
Mon, 10 Mar 2014 06:02:13 +0000 (06:02 +0000)
llvm-svn: 203446

clang/test/Index/preamble-reparse-warn-end-of-file.c patch | blob | history
clang/test/Index/preamble-reparse-warn-macro.c patch | blob | history

diff --git a/clang/test/Index/preamble-reparse-warn-end-of-file.c b/clang/test/Index/preamble-reparse-warn-end-of-file.c
index 07e4919..c2ae892 100644 (file)
--- a/clang/test/Index/preamble-reparse-warn-end-of-file.c
+++ b/clang/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/clang/test/Index/preamble-reparse-warn-macro.c b/clang/test/Index/preamble-reparse-warn-macro.c
index de4c003..e02fbde 100644 (file)
--- a/clang/test/Index/preamble-reparse-warn-macro.c
+++ b/clang/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
Domain: System / Toolchain;