diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2014-03-11 18:25:33 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2014-03-11 18:25:33 +0000 |
| commit | 698a5bdbba4c01c39a03b23280cd95ecbf153164 (patch) | |
| tree | 94c09af9a2333ff677b2459cfb12fca2b502c7a9 | |
| parent | bf56cb50a84ed79dc67d6bb0361a2309a51a4fe0 (diff) | |
| download | bcm5719-llvm-698a5bdbba4c01c39a03b23280cd95ecbf153164.tar.gz bcm5719-llvm-698a5bdbba4c01c39a03b23280cd95ecbf153164.zip | |
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.
llvm-svn: 203595
| -rw-r--r-- | llvm/test/Linker/datalayout.ll | 6 | ||||
| -rw-r--r-- | llvm/test/Linker/targettriple.ll | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/llvm/test/Linker/datalayout.ll b/llvm/test/Linker/datalayout.ll index de343027803..8cbfc198a68 100644 --- a/llvm/test/Linker/datalayout.ll +++ b/llvm/test/Linker/datalayout.ll @@ -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: diff --git a/llvm/test/Linker/targettriple.ll b/llvm/test/Linker/targettriple.ll index cf64e3f8729..71830477bdd 100644 --- a/llvm/test/Linker/targettriple.ll +++ b/llvm/test/Linker/targettriple.ll @@ -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: |
