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

Justin Bogner mail at justinbogner.com
Thu Aug 7 11:45:21 PDT 2014


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.

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'





More information about the cfe-commits mailing list