revert r116782 & r116793 to fix msvc9 buildbots

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@116976 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/Coverage/html-diagnostics.c b/test/Coverage/html-diagnostics.c
index f9c4b54de3e006c486504224978c92907aa01325..81b2cfa588e3214756a1c7e96ab9c7f9f3c008fe 100644 (file)
--- a/test/Coverage/html-diagnostics.c
+++ b/test/Coverage/html-diagnostics.c
@@ -1,12 +1,9 @@
 // RUN: rm -rf %t
 // RUN: %clang_cc1 -analyze -analyzer-output=html -analyzer-check-objc-mem -o %t %s
-// RUN: find %t -type f -name '*.html' -exec cat '{}' ';' | FileCheck %s
+// RUN: cat %t/*.html | FileCheck %s
 
 // CHECK: <h3>Annotated Source Code</h3>
-
-// Without tweaking expr, the expr would hit to the line below
-// emitted to the output as comment.
-// CHECK: {{[D]ereference of null pointer}}
+// CHECK: Dereference of null pointer
 
 void f0(int x) {
   int *p = &x;