make qmake test suite a tad more verbose on failure

automatically dump the collected output on non-expected return code

Change-Id: Ifda7287869f329c5a6714e6f21aa9c3991e9ee4e
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/tests/auto/tools/qmake/testcompiler.h b/tests/auto/tools/qmake/testcompiler.h
index c438b52db2..8aed3a9987 100644
--- a/tests/auto/tools/qmake/testcompiler.h
+++ b/tests/auto/tools/qmake/testcompiler.h
@@ -69,7 +69,7 @@ public:
     // executes a qmake on proName in the specified workDir, output goes to buildDir or workDir if it's null
     bool qmake( const QString &workDir, const QString &proName, const QString &buildDir = QString() );
     // executes a make in the specified workPath, with an optional target (eg. install)
-    bool make( const QString &workPath, const QString &target = QString() );
+    bool make( const QString &workPath, const QString &target = QString(), bool expectFail = false );
     // checks if the executable exists in destDir
     bool exists( const QString &destDir, const QString &exeName, BuildType buildType, const QString &version );
     // removes the makefile
@@ -80,13 +80,13 @@ public:
     void clearCommandOutput();
 
 private:
-    bool runCommand( QString cmdLine );
+    bool runCommand( QString cmdLine, bool expectFail = false );
+    bool errorOut();
 
     QString makeCmd_, makeArgs_;
     QString qmakeCmd_, qmakeArgs_;
     QStringList environment_;
 
-    // need to make this available somewhere
     QStringList testOutput_;
 };