clang plugin: Make tests pass again.

Also make the output for failing tests a bit more useful and readable.

The tests regressed in http://codereview.chromium.org/6901095

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/6990009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86118 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 4 insertions, 1 deletions

diff --git a/tools/clang/plugins/FindBadConstructs.cpp b/tools/clang/plugins/FindBadConstructs.cpp
index 4c3c8ef..e90c280 100644
--- a/tools/clang/plugins/FindBadConstructs.cpp
+++ b/tools/clang/plugins/FindBadConstructs.cpp
@@ -125,7 +125,7 @@ class FindBadConstructsConsumer : public ChromeClassTester {
       if (!record->hasUserDeclaredDestructor()) {
         emitWarning(
             record_location,
-            "Complex class/struct needs a needs an explicit out-of-line "
+            "Complex class/struct needs an explicit out-of-line "
             "destructor.");
       } else if (CXXDestructorDecl* dtor = record->getDestructor()) {
         if (dtor->hasInlineBody()) {
diff --git a/tools/clang/plugins/tests/test.sh b/tools/clang/plugins/tests/test.sh
index e22e0d7..37bbaf6 100755
--- a/tools/clang/plugins/tests/test.sh
+++ b/tools/clang/plugins/tests/test.sh
@@ -30,6 +30,9 @@ do_testcase() {
     echo "FAIL: ${1}"
     echo "Output of compiler:"
     echo "${output}"
+    echo "Expected output:"
+    cat "${2}"
+    echo
   fi
 }