r215129 - test/Modules: Use FileCheck's -allow-empty instead of "count 0"

[Richard Smith]

On Thu, Aug 7, 2014 at 11:45 AM, Justin Bogner <mail at justinbogner.com>
wrote:

> Author: bogner
> Date: Thu Aug  7 13:45:21 2014
> New Revision: 215129
>
> URL: http://llvm.org/viewvc/llvm-project?rev=215129&view=rev
> Log:
> test/Modules: Use FileCheck's -allow-empty instead of "count 0"
>
> Piping stderr into "count 0" in tests doesn't work - things like guard
> malloc write to stderr and mess up the count. This comes up all the
> time, so I've added a feature to FileCheck to fix it this time.
>

Hah, thanks, I had an essentially identical patch to FileCheck that I was
just about to mail out to support this test =)


> Fixes test failures caused by r215046 under guard malloc.
>
> Modified:
>     cfe/trunk/test/Modules/Rmodule-build.m
>
> Modified: cfe/trunk/test/Modules/Rmodule-build.m
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Rmodule-build.m?rev=215129&r1=215128&r2=215129&view=diff
>
> ==============================================================================
> --- cfe/trunk/test/Modules/Rmodule-build.m (original)
> +++ cfe/trunk/test/Modules/Rmodule-build.m Thu Aug  7 13:45:21 2014
> @@ -24,11 +24,14 @@
>
>  // RUN: echo ' ' >> %t/B.h
>  // RUN: %clang_cc1 -fmodules -fmodules-cache-path=%t -fsyntax-only %s -I
> %t \
> -// RUN:            2>&1 | count 0
> +// RUN:            2>&1 | FileCheck -allow-empty -check-prefix=NO-REMARKS
> %s
>
>  // RUN: echo ' ' >> %t/B.h
>  // RUN: %clang_cc1 -fmodules -fmodules-cache-path=%t -fsyntax-only %s -I
> %t \
> -// RUN:            -Rmodule-build -Rno-everything 2>&1 | count 0
> +// RUN:            -Rmodule-build -Rno-everything 2>&1 | \
> +// RUN:    FileCheck -allow-empty -check-prefix=NO-REMARKS %s
>
>  // CHECK-NOT: building module 'A'
>  // CHECK: building module 'B'
> +// NO-REMARKS-NOT: building module 'A'
> +// NO-REMARKS-NOT: building module 'B'
>
>
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20140807/c1fd6727/attachment.html>