aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonas Karlsson <jonas.karlsson@qt.io>2021-02-24 14:58:22 +0100
committerJonas Karlsson <jonas.karlsson@qt.io>2021-02-25 13:29:57 +0000
commita2a73da956217eff023d1074005990ced4d098a2 (patch)
treecf0190931286b1e0e2cabf7b401896834f3e6caf
parent7ef9d3700c967b8f67f078d86ca0ef2c7e041fa5 (diff)
Bail on invalid shell option
Task-Id: QTBUG-78695 Change-Id: Ib0896b4e7b401521eef38e1b27901160757256fa Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
-rw-r--r--src/main.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 0e1f920..4b4148a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -125,7 +125,8 @@ QStringList processCommandLineArguments(const QCoreApplication &app)
QCommandLineOption templateOption(QStringList() << QStringLiteral("s") << QStringLiteral("shell"),
QStringLiteral("What kind of benchmark shell to run: 'sustained-fps', 'static-count', 'frame-count'"),
- QStringLiteral("template"));
+ QStringLiteral("template"),
+ QStringLiteral("frame-count"));
parser.addOption(templateOption);
QCommandLineOption countOption(QStringLiteral("count"),
@@ -196,9 +197,12 @@ QStringList processCommandLineArguments(const QCoreApplication &app)
Options::instance.bmTemplate = QStringLiteral("qrc:/Shell_SustainedFpsWithCount.qml");
else if (Options::instance.bmTemplate == QStringLiteral("static-count"))
Options::instance.bmTemplate = QStringLiteral("qrc:/Shell_SustainedFpsWithStaticCount.qml");
- else { // "frame-count" and also the default option now
+ else if (Options::instance.bmTemplate == QStringLiteral("frame-count")) {
ResultRecorder::opsAreActuallyFrames = true;
Options::instance.bmTemplate = QStringLiteral("qrc:/Shell_TotalFramesWithStaticCount.qml");
+ } else {
+ qWarning() << "Invalid shell:" << Options::instance.bmTemplate;
+ exit(1);
}
foreach (QString input, parser.positionalArguments()) {