diff options
author | Christian Kandeler <christian.kandeler@digia.com> | 2014-02-17 10:42:44 +0100 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-02-17 11:02:19 +0100 |
commit | 36ef8aa8db6ad7aba03bd41d9206465506e02598 (patch) | |
tree | 77fb5ce4b1f0119687e54475f95c3a092151447d /tests/fuzzy-test | |
parent | 5e34c0538f38a675b2fa7ac1e9400402de242fd9 (diff) |
Fuzzy test: More verbose output, wait longer for git.
Change-Id: I19baf426bdf81b80d9a5f52adaf7b815d242c65a
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'tests/fuzzy-test')
-rw-r--r-- | tests/fuzzy-test/fuzzytester.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/fuzzy-test/fuzzytester.cpp b/tests/fuzzy-test/fuzzytester.cpp index bee4c2b4f..87ff82b2b 100644 --- a/tests/fuzzy-test/fuzzytester.cpp +++ b/tests/fuzzy-test/fuzzytester.cpp @@ -44,6 +44,7 @@ void FuzzyTester::runTest(const QString &profile, const QString &startCommit) m_profile = profile; runGit(QStringList() << "describe" << "HEAD", &m_headCommit); + qDebug("HEAD is %s", qPrintable(m_headCommit)); qDebug("Trying to find a buildable commit to start with..."); const QString workingStartCommit = findWorkingStartCommit(startCommit); @@ -67,6 +68,8 @@ void FuzzyTester::runTest(const QString &profile, const QString &startCommit) foreach (const QString ¤tCommit, allCommits) { buildSequence << currentCommit; checkoutCommit(currentCommit); + qDebug("Testing incremental build #%d (%s)", buildSequence.count() - 1, + qPrintable(currentCommit)); QString qbsError; if (!runQbs(defaultBuildDir(), &qbsError)) { // An error could be due to the current commit being faulty. Check that it is @@ -107,6 +110,7 @@ QString FuzzyTester::findWorkingStartCommit(const QString &startCommit) removeDir(defaultBuildDir()); if (runQbs(defaultBuildDir(), &qbsError)) return currentCommit; + qDebug("Commit %s is not buildable.", qPrintable(currentCommit)); } throw TestError(QString::fromLocal8Bit("Cannot run test: Failed to find a single commit that " "builds successfully with qbs. The last qbs error was: '%1'").arg(qbsError)); @@ -118,7 +122,7 @@ void FuzzyTester::runGit(const QStringList &arguments, QString *output) git.start("git", arguments); if (!git.waitForStarted()) throw TestError("Failed to start git. It is expected to be in the PATH."); - if (!git.waitForFinished()) + if (!git.waitForFinished(300000)) // 5 minutes ought to be enough for everyone throw TestError(QString::fromLocal8Bit("git failed: %1").arg(git.errorString())); if (output) *output = QString::fromLocal8Bit(git.readAllStandardOutput()).trimmed(); |