From e933f45b227136ef3035fa4995e424da7d43d677 Mon Sep 17 00:00:00 2001 From: NAKAMURA Takumi Date: Mon, 10 Mar 2014 06:02:13 +0000 Subject: [PATCH] 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 --- test/Index/preamble-reparse-warn-end-of-file.c | 7 +++---- test/Index/preamble-reparse-warn-macro.c | 4 +--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/test/Index/preamble-reparse-warn-end-of-file.c b/test/Index/preamble-reparse-warn-end-of-file.c index 07e4919e43..c2ae892fbc 100644 --- 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 de4c003bdf..e02fbde784 100644 --- 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 -- 2.40.0