[llvm] r203595 - Don't assume an empty stderr.

[Rafael Espindola]

Author: rafael
Date: Tue Mar 11 13:25:33 2014
New Revision: 203595

URL: http://llvm.org/viewvc/llvm-project?rev=203595&view=rev
Log:
Don't assume an empty stderr.

GuardMalloc can print info to stderr, causing these tests to fail.
Since FileCheck errors on empty inputs, just add a bit of dummy
data to make it happy.

Modified:
    llvm/trunk/test/Linker/datalayout.ll
    llvm/trunk/test/Linker/targettriple.ll

Modified: llvm/trunk/test/Linker/datalayout.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/datalayout.ll?rev=203595&r1=203594&r2=203595&view=diff
==============================================================================
--- llvm/trunk/test/Linker/datalayout.ll (original)
+++ llvm/trunk/test/Linker/datalayout.ll Tue Mar 11 13:25:33 2014
@@ -1,5 +1,6 @@
+; REQUIRES: shell
 ; RUN: llvm-link %s %S/Inputs/datalayout-a.ll -S -o - 2>%t.a.err | FileCheck %s
-; RUN: cat %t.a.err | not FileCheck %s 2>&1 | FileCheck --check-prefix=WARN-A %s
+; RUN: (echo foo ;cat %t.a.err) | FileCheck --check-prefix=WARN-A %s
 
 ; RUN: llvm-link %s %S/Inputs/datalayout-b.ll -S -o - 2>%t.b.err | FileCheck %s
 ; RUN: cat %t.b.err | FileCheck --check-prefix=WARN-B %s
@@ -8,7 +9,6 @@ target datalayout = "e"
 
 ; CHECK: target datalayout = "e"
 
-; this is a hack to check that llvm-link printed no warnings.
-; WARN-A: FileCheck error: '-' is empty.
+; WARN-A-NOT: WARNING
 
 ; WARN-B: WARNING: Linking two modules of different data layouts:

Modified: llvm/trunk/test/Linker/targettriple.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/targettriple.ll?rev=203595&r1=203594&r2=203595&view=diff
==============================================================================
--- llvm/trunk/test/Linker/targettriple.ll (original)
+++ llvm/trunk/test/Linker/targettriple.ll Tue Mar 11 13:25:33 2014
@@ -1,5 +1,6 @@
+; REQUIRES: shell
 ; RUN: llvm-link %s %S/Inputs/targettriple-a.ll -S -o - 2>%t.a.err | FileCheck %s
-; RUN: cat %t.a.err | not FileCheck %s 2>&1 | FileCheck --check-prefix=WARN-A %s
+; RUN: (echo foo ;cat %t.a.err) | FileCheck --check-prefix=WARN-A %s
 
 ; RUN: llvm-link %s %S/Inputs/targettriple-b.ll -S -o - 2>%t.b.err | FileCheck %s
 ; RUN: cat %t.b.err | FileCheck --check-prefix=WARN-B %s
@@ -8,7 +9,6 @@ target triple = "e"
 
 ; CHECK: target triple = "e"
 
-; this is a hack to check that llvm-link printed no warnings.
-; WARN-A: FileCheck error: '-' is empty.
+; WARN-A-NOT: WARNING
 
 ; WARN-B: WARNING: Linking two modules of different target triples: