From a2a73da956217eff023d1074005990ced4d098a2 Mon Sep 17 00:00:00 2001 From: Jonas Karlsson Date: Wed, 24 Feb 2021 14:58:22 +0100 Subject: Bail on invalid shell option Task-Id: QTBUG-78695 Change-Id: Ib0896b4e7b401521eef38e1b27901160757256fa Reviewed-by: Laszlo Agocs --- src/main.cpp | 8 ++++++-- 1 file 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()) { -- cgit v1.2.3