From 69ba3306fcd821b4646984f91ed6db1ac8f83c2e Mon Sep 17 00:00:00 2001 From: Justin Bogner Date: Thu, 7 Aug 2014 18:45:21 +0000 Subject: [PATCH] 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. llvm-svn: 215129 --- clang/test/Modules/Rmodule-build.m | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/clang/test/Modules/Rmodule-build.m b/clang/test/Modules/Rmodule-build.m index b8abc01c2c1a..3aba1857bcff 100644 --- a/clang/test/Modules/Rmodule-build.m +++ b/clang/test/Modules/Rmodule-build.m @@ -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'