diff --git a/tests/auto/testlib/selftests/tst_selftests.cpp b/tests/auto/testlib/selftests/tst_selftests.cpp index eda3d9afc7..819fbf61f4 100644 --- a/tests/auto/testlib/selftests/tst_selftests.cpp +++ b/tests/auto/testlib/selftests/tst_selftests.cpp @@ -1025,12 +1025,10 @@ TestProcessResult runTestProcess(const QString &test, const QStringList &argumen return { process.exitCode(), standardOutput, standardError }; } -enum class Throw { OnFail = 1 }; - /* Runs a single test and verifies the output against the expected results. */ -void runTest(const QString &test, const TestLoggers &requestedLoggers, Throw throwing = {}) +void runTest(const QString &test, const TestLoggers &requestedLoggers) { TestLoggers loggers; for (auto logger : requestedLoggers) { @@ -1044,10 +1042,6 @@ void runTest(const QString &test, const TestLoggers &requestedLoggers, Throw thr QStringList arguments; for (auto logger : loggers) arguments += logger.arguments(test); - if (throwing == Throw::OnFail) // don't distinguish between throwonfail/throwonskip - arguments += {"-throwonfail", "-throwonskip"}; - else - arguments += {"-nothrowonfail", "-nothrowonskip"}; CAPTURE(test); CAPTURE(arguments); @@ -1074,9 +1068,9 @@ void runTest(const QString &test, const TestLoggers &requestedLoggers, Throw thr /* Runs a single test and verifies the output against the expected result. */ -void runTest(const QString &test, const TestLogger &logger, Throw t = {}) +void runTest(const QString &test, const TestLogger &logger) { - runTest(test, TestLoggers{logger}, t); + runTest(test, TestLoggers{logger}); } // ----------------------- Catch helpers ----------------------- @@ -1219,12 +1213,7 @@ SCENARIO("Test output of the loggers is as expected") GIVEN("The " << logger << " logger") { for (QString test : tests) { AND_GIVEN("The " << test << " subtest") { - WHEN("Throwing on failure or skip") { - runTest(test, TestLogger(logger, StdoutOutput), Throw::OnFail); - } - WHEN("Returning on failure or skip") { - runTest(test, TestLogger(logger, StdoutOutput)); - } + runTest(test, TestLogger(logger, StdoutOutput)); } } }