AutoTest: Tweak run after successful build

Make it possible to distinguish between all and selected
test cases also for the automatic run after build feature.

Change-Id: I91715a7ae4f09cea2e31844940a6b21ae9e62157
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Stenger
2019-09-13 10:50:32 +02:00
parent 4a20a596c8
commit a8cad2038e
9 changed files with 87 additions and 31 deletions

View File

@@ -674,11 +674,11 @@ void TestRunner::buildFinished(bool success)
}
}
static bool runAfterBuild()
static RunAfterBuildMode runAfterBuild()
{
Project *project = SessionManager::startupProject();
if (!project)
return false;
return RunAfterBuildMode::None;
if (!project->namedSettings(Constants::SK_USE_GLOBAL).isValid())
return AutotestPlugin::settings()->runAfterBuild;
@@ -696,14 +696,16 @@ void TestRunner::onBuildQueueFinished(bool success)
if (!success || m_runMode != TestRunMode::None)
return;
if (!runAfterBuild())
RunAfterBuildMode mode = runAfterBuild();
if (mode == RunAfterBuildMode::None)
return;
auto testTreeModel = TestTreeModel::instance();
if (!testTreeModel->hasTests())
return;
setSelectedTests(testTreeModel->getAllTestCases());
setSelectedTests(mode == RunAfterBuildMode::All ? testTreeModel->getAllTestCases()
: testTreeModel->getSelectedTests());
prepareToRunTests(TestRunMode::RunAfterBuild);
}