From 7e3e9aa8e1eb2f138a6e3a6a9d582c3eb6b08810 Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Tue, 11 Mar 2014 18:25:33 +0000 Subject: [PATCH] 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. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@203595 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/Linker/datalayout.ll | 6 +++--- test/Linker/targettriple.ll | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/Linker/datalayout.ll b/test/Linker/datalayout.ll index de343027803..8cbfc198a68 100644 --- a/test/Linker/datalayout.ll +++ b/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/test/Linker/targettriple.ll b/test/Linker/targettriple.ll index cf64e3f8729..71830477bdd 100644 --- a/test/Linker/targettriple.ll +++ b/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: