From 853b16ccee4ea7647a231b15a2e9d6e54c7703ae Mon Sep 17 00:00:00 2001
From: Bill King <bill.king@nokia.com>
Date: Thu, 17 Feb 2011 16:07:47 +0100
Subject: [PATCH] Tests: cleanup output so that it appears inline with
 associated test.

---
 tests/auto/cplusplus/ast/tst_ast.cpp | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/tests/auto/cplusplus/ast/tst_ast.cpp b/tests/auto/cplusplus/ast/tst_ast.cpp
index 4578de13d6f..1b17bf494b5 100644
--- a/tests/auto/cplusplus/ast/tst_ast.cpp
+++ b/tests/auto/cplusplus/ast/tst_ast.cpp
@@ -41,8 +41,31 @@ public:
 
     TranslationUnit *parseStatement(const QByteArray &source)
     { return parse(source, TranslationUnit::ParseStatement); }
+    
+    class Diagnostic: public DiagnosticClient {
+    public:
+        int errorCount;
+
+        Diagnostic()
+            : errorCount(0)
+        { }
+
+        virtual void report(int /*level*/,
+                            const StringLiteral *fileName,
+                            unsigned line, unsigned column,
+                            const char *format, va_list ap)
+        {
+            ++errorCount;
+
+            qDebug() << fileName->chars()<<':'<<line<<':'<<column<<' '<<QString().vsprintf(format, ap);
+        }
+    };
+
+    Diagnostic diag;    
+    
 
 private slots:
+    void initTestCase();
     // declarations
     void gcc_attributes_1();
 
@@ -1091,5 +1114,10 @@ void tst_AST::q_enum_1()
     QCOMPARE(unit->spell(e->identifier_token), "e");
 }
 
+void tst_AST::initTestCase()
+{
+    control.setDiagnosticClient(&diag);
+}
+
 QTEST_APPLESS_MAIN(tst_AST)
 #include "tst_ast.moc"