feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

AutoTest: Merge settings and tools hierarchies [1/2]

Browse Source 
Currently living in the settings files to keep changes small,
will be renamed in a second step.

This allows the settings aspects to be used in their short form
and overall removes some indirections.

Change-Id: I099369b62239aed8192613a04bca958a660c36c7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2023-07-11 12:40:08 +02:00
parent 345c946255
commit 14e18fc92f
37 changed files with 489 additions and 567 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/autotest/gtest/gtestconfiguration.cpp
View File

@@ -67,21 +67,19 @@ QStringList GTestConfiguration::argumentsForTestRunner(QStringList *omitted) con
arguments << "--gtest_filter=\"" + testSets.join(':') + '"';
}
auto gSettings = static_cast<GTestSettings *>(framework()->testSettings());
if (!gSettings)
return arguments;
GTestFramework &gSettings = *static_cast<GTestFramework *>(framework());
if (gSettings->runDisabled.value())
if (gSettings.runDisabled())
arguments << "--gtest_also_run_disabled_tests";
if (gSettings->repeat.value())
arguments << QString("--gtest_repeat=%1").arg(gSettings->iterations.value());
if (gSettings->shuffle.value())
arguments << "--gtest_shuffle" << QString("--gtest_random_seed=%1").arg(gSettings->seed.value());
if (gSettings->throwOnFailure.value())
if (gSettings.repeat())
arguments << QString("--gtest_repeat=%1").arg(gSettings.iterations());
if (gSettings.shuffle())
arguments << "--gtest_shuffle" << QString("--gtest_random_seed=%1").arg(gSettings.seed());
if (gSettings.throwOnFailure())
arguments << "--gtest_throw_on_failure";
if (isDebugRunMode()) {
if (gSettings->breakOnFailure.value())
if (gSettings.breakOnFailure())
arguments << "--gtest_break_on_failure";
arguments << "--gtest_catch_exceptions=0";
}