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

AutoTest: Filter interfering arguments for Catch tests

Browse Source 
Some of the possible options usable with a Catch test executable
may interfere with what is expected on the AutoTest plugin side.
Other options will be provided by settings that will be added
in a follow-up.

Change-Id: I9613c28c2e0fac8af27c5e8293921933bd570337
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Stenger
2020-04-17 12:22:14 +02:00
parent ad9e4cd2f6
commit df830ccf08
1 changed files with 61 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
src/plugins/autotest/catch/catchconfiguration.cpp
View File

@@ -25,6 +25,9 @@
#include "catchconfiguration.h"
#include "catchoutputreader.h"
#include "../autotestplugin.h"
#include "../testsettings.h"
namespace Autotest {
namespace Internal {
@@ -33,15 +36,69 @@ TestOutputReader *CatchConfiguration::outputReader(const QFutureInterface<TestRe
return new CatchOutputReader(fi, app, buildDirectory(), projectFile());
}
static QStringList filterInterfering(const QStringList &provided, QStringList *omitted)
{
static const QSet<QString> singleOptions { "-l", "--list-tests",
"--list-test-names-only",
"-t", "--list-tags",
"--list-reporters",
"-s", "--success",
"-b", "--break",
"-e", "--nothrow",
"-a", "--abort",
"-#", "--filenames-as-tags",
"--benchmark-no-analysis",
"--help"
};
static const QSet<QString> paramOptions { "-o", "--out",
"-r", "--reporter",
"-x", "--abortx",
"-w", "--warn",
"-d", "--durations",
"-f", "--input-file",
"-c", "--section",
"--wait-for-keypress",
"--benchmark-samples",
"--benchmark-resamples",
"--benchmark-confidence-interval",
"--benchmark-warmup-time",
"--use-color"
};
QStringList allowed;
bool filterNext = false;
for (auto arg : provided) {
bool interferes = false;
if (filterNext) {
omitted->append(arg);
filterNext = false;
continue;
}
if (singleOptions.contains(arg)) {
interferes = true;
} else if (paramOptions.contains(arg)) {
interferes = true;
filterNext = true;
}
if (!interferes)
allowed.append(arg);
else if (omitted)
omitted->append(arg);
}
return allowed;
}
QStringList CatchConfiguration::argumentsForTestRunner(QStringList *omitted) const
{
Q_UNUSED(omitted)
QStringList arguments;
arguments << "--reporter" << "xml";
if (testCaseCount())
arguments << "\"" + testCases().join("\",\"") + "\"";
arguments << "--reporter" << "xml";
if (AutotestPlugin::settings()->processArgs) {
arguments << filterInterfering(runnable().commandLineArguments.split(
' ', QString::SkipEmptyParts), omitted);
}
return arguments;
}