revert r116782 & r116793 to fix msvc9 buildbots

llvm-svn: 116976
diff --git a/clang/test/Coverage/html-diagnostics.c b/clang/test/Coverage/html-diagnostics.c
index f9c4b54..81b2cfa 100644
--- a/clang/test/Coverage/html-diagnostics.c
+++ b/clang/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;