diff options
author | Ivan Komissarov <abbapoh@gmail.com> | 2021-05-17 15:09:12 +0200 |
---|---|---|
committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2021-05-17 15:25:26 +0000 |
commit | 3ec5e234fe40985d58839409c3dce53d4cd78f17 (patch) | |
tree | 2f0f393d76262a249a612ea826d5632635d5c48a /tests | |
parent | 9a5667a8d19a05991c164bb03aacc9333525a59b (diff) | |
download | qbs-3ec5e234fe40985d58839409c3dce53d4cd78f17.tar.gz |
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>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/blackbox/tst_blackboxbase.cpp | 13 |
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 ¶ms) 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 ¶ms) 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; } /*! |