Avoid code duplication in TestBlackboxBase::runQbs

Now we write log in both success and error cases, the only difference is
that we reset exitCode to -1 in error case.

Change-Id: I2ffe9b14c0ba1ad11acd9f81f35a0594dda26c12
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

1 files changed, 6 insertions, 7 deletions

diff --git a/tests/auto/blackbox/tst_blackboxbase.cpp b/tests/auto/blackbox/tst_blackboxbase.cpp
index ab77beee6..ed0b90b55 100644
--- a/tests/auto/blackbox/tst_blackboxbase.cpp
+++ b/tests/auto/blackbox/tst_blackboxbase.cpp
@@ -96,17 +96,16 @@ int TestBlackboxBase::runQbs(const QbsRunParameters &params)
         process.setWorkingDirectory(params.workingDir);
     process.setProcessEnvironment(params.environment);
     process.start(qbsExecutableFilePath, args);
+    int exitCode = 0;
     if (!process.waitForStarted() || !process.waitForFinished(testTimeoutInMsecs())
             || process.exitStatus() != QProcess::NormalExit) {
-        m_qbsStderr = process.readAllStandardError();
-        m_qbsStdout = process.readAllStandardOutput();
         if (!params.expectCrash) {
             QTest::qFail("qbs did not run correctly", __FILE__, __LINE__);
             qDebug("%s", qPrintable(process.errorString()));
-            qDebug("%s", m_qbsStderr.constData());
-            qDebug("%s", m_qbsStdout.constData());
         }
-        return -1;
+        exitCode = -1;
+    } else {
+        exitCode = process.exitCode();
     }
 
     m_qbsStderr = process.readAllStandardError();
@@ -114,14 +113,14 @@ int TestBlackboxBase::runQbs(const QbsRunParameters &params)
     sanitizeOutput(&m_qbsStderr);
     sanitizeOutput(&m_qbsStdout);
     const bool shouldLog = (process.exitStatus() != QProcess::NormalExit
-            || process.exitCode() != 0) && !params.expectFailure;
+            || exitCode != 0) && !params.expectFailure;
     if (!m_qbsStderr.isEmpty()
             && (shouldLog || qEnvironmentVariableIsSet("QBS_AUTOTEST_ALWAYS_LOG_STDERR")))
         qDebug("%s", m_qbsStderr.constData());
     if (!m_qbsStdout.isEmpty()
             && (shouldLog || qEnvironmentVariableIsSet("QBS_AUTOTEST_ALWAYS_LOG_STDOUT")))
         qDebug("%s", m_qbsStdout.constData());
-    return process.exitCode();
+    return exitCode;
 }
 
 /*!