diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2014-04-11 13:40:17 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2014-04-15 14:18:55 +0200 |
| commit | 637249a8c1ef722c5646e1ca85d516f88a1a1dc6 (patch) | |
| tree | 89f8322163bb810a048e5c4e211fe69193e4cd0f /tests/auto/api | |
| parent | fdc392858716c390f1541430dad3bb6aefdf792e (diff) | |
Allow long-running commands to be canceled.
At the moment, canceling a build waits for the current
command to finish, which means that a badly behaving process
or piece of JavaScript code can block qbs indefinitely.
Task-number: QBS-552
Change-Id: I8ac23f068dd6083905a9681097da6b970c0b646b
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'tests/auto/api')
| -rw-r--r-- | tests/auto/api/tst_api.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/auto/api/tst_api.cpp b/tests/auto/api/tst_api.cpp index aaafd49ce..13af57c4a 100644 --- a/tests/auto/api/tst_api.cpp +++ b/tests/auto/api/tst_api.cpp @@ -442,8 +442,7 @@ void TestApi::infiniteLoop() QVERIFY2(!setupJob->error().hasError(), qPrintable(setupJob->error().toString())); qbs::Project project = setupJob->project(); const QScopedPointer<qbs::BuildJob> buildJob(project.buildAllProducts(qbs::BuildOptions())); - QTimer::singleShot(1000, setupJob.data(), SLOT(cancel())); - QEXPECT_FAIL(0, "QBS-552", Continue); + QTimer::singleShot(1000, buildJob.data(), SLOT(cancel())); QVERIFY(waitForFinished(buildJob.data(), 3000)); } |