diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2017-06-22 13:36:04 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2017-06-22 12:22:15 +0000 |
| commit | 5d4996442f9f03ecba3f4e96c9ceb5eb42a0bb18 (patch) | |
| tree | e0b878a984e45e5bdfa07b36a8271dbddeb3cda0 /tests/auto/blackbox/tst_blackboxbase.cpp | |
| parent | 16432be9afc39372b7c35a4fb2929b5835c067e0 (diff) | |
Autotests: Provide a means to specify the timeout via the environment
There are some exceedingly slow test machines for which sometimes even
our generous default timeout is not enough.
Change-Id: I278f3e3c6c85ed65ba24312e0788aa4bfa323dd2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'tests/auto/blackbox/tst_blackboxbase.cpp')
| -rw-r--r-- | tests/auto/blackbox/tst_blackboxbase.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/auto/blackbox/tst_blackboxbase.cpp b/tests/auto/blackbox/tst_blackboxbase.cpp index 04af84538..e484aab6a 100644 --- a/tests/auto/blackbox/tst_blackboxbase.cpp +++ b/tests/auto/blackbox/tst_blackboxbase.cpp @@ -87,8 +87,7 @@ int TestBlackboxBase::runQbs(const QbsRunParameters ¶ms) QProcess process; process.setProcessEnvironment(params.environment); process.start(qbsExecutableFilePath, args); - const int waitTime = 10 * 60000; - if (!process.waitForStarted() || !process.waitForFinished(waitTime) + if (!process.waitForStarted() || !process.waitForFinished(testTimeoutInMsecs()) || process.exitStatus() != QProcess::NormalExit) { m_qbsStderr = process.readAllStandardError(); QTest::qFail("qbs did not run correctly", __FILE__, __LINE__); |