[llvm] r202341 - Revert "Use count 0."

[Juergen Ributzka]

No problem. Guard Malloc is just too talkative :P

On Feb 27, 2014, at 5:57 AM, Rafael Espíndola <rafael.espindola at gmail.com> wrote:

> Oh, sorry about that.
> 
> On 26 February 2014 22:10, Juergen Ributzka <juergen at apple.com> wrote:
>> Author: ributzka
>> Date: Wed Feb 26 21:10:10 2014
>> New Revision: 202341
>> 
>> URL: http://llvm.org/viewvc/llvm-project?rev=202341&view=rev
>> Log:
>> Revert "Use count 0."
>> 
>> This reverts commit r202283, because when we use GuardMalloc the test will fail
>> due to additional output to std err.
>> 
>> Modified:
>>    llvm/trunk/test/Linker/datalayout.ll
>> 
>> Modified: llvm/trunk/test/Linker/datalayout.ll
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/datalayout.ll?rev=202341&r1=202340&r2=202341&view=diff
>> ==============================================================================
>> --- llvm/trunk/test/Linker/datalayout.ll (original)
>> +++ llvm/trunk/test/Linker/datalayout.ll Wed Feb 26 21:10:10 2014
>> @@ -1,5 +1,5 @@
>> ; RUN: llvm-link %s %S/Inputs/datalayout-a.ll -S -o - 2>%t.a.err | FileCheck %s
>> -; RUN: cat %t.a.err | count 0
>> +; RUN: cat %t.a.err | not FileCheck %s 2>&1 | 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,4 +8,7 @@ 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-B: WARNING: Linking two modules of different data layouts!
>> 
>> 
>> _______________________________________________
>> llvm-commits mailing list
>> llvm-commits at cs.uiuc.edu
>> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits