1 files changed, 16 insertions, 2 deletions
diff --git a/tests/auto/api/tst_api.cpp b/tests/auto/api/tst_api.cpp
index 13af57c4a..2e441d220 100644
--- a/tests/auto/api/tst_api.cpp
+++ b/tests/auto/api/tst_api.cpp
@@ -429,7 +429,7 @@ void TestApi::fileTagsFilterOverride()
     QVERIFY(installableFiles.first().targetDirectory().contains("habicht"));
 }
 
-void TestApi::infiniteLoop()
+void TestApi::infiniteLoopBuilding()
 {
     QFETCH(QString, projectDirName);
     qbs::SetupProjectParameters setupParams = defaultSetupParameters();
@@ -446,13 +446,27 @@ void TestApi::infiniteLoop()
     QVERIFY(waitForFinished(buildJob.data(), 3000));
 }
 
-void TestApi::infiniteLoop_data()
+void TestApi::infiniteLoopBuilding_data()
 {
     QTest::addColumn<QString>("projectDirName");
     QTest::newRow("JS Command") << QString("infinite-loop-js");
     QTest::newRow("Process Command") << QString("infinite-loop-process");
 }
 
+void TestApi::infiniteLoopResolving()
+{
+    qbs::SetupProjectParameters setupParams = defaultSetupParameters();
+    const QString projectDir = QDir::cleanPath(m_workingDataDir + "/infinite-loop-resolving");
+    setupParams.setProjectFilePath(projectDir + "/project.qbs");
+    setupParams.setBuildRoot(projectDir);
+    QScopedPointer<qbs::SetupProjectJob> setupJob(qbs::Project::setupProject(setupParams,
+                                                                             m_logSink, 0));
+    QTimer::singleShot(1000, setupJob.data(), SLOT(cancel()));
+    QVERIFY(waitForFinished(setupJob.data(), 3000));
+    QVERIFY2(setupJob->error().toString().toLower().contains("cancel"),
+             qPrintable(setupJob->error().toString()));
+}
+
 void TestApi::installableFiles()
 {
     qbs::SetupProjectParameters setupParams = defaultSetupParameters();