diff --git a/tests/auto/testlib/selftests/generate_expected_output.py b/tests/auto/testlib/selftests/generate_expected_output.py index 8f6134725bf..be3633db74f 100755 --- a/tests/auto/testlib/selftests/generate_expected_output.py +++ b/tests/auto/testlib/selftests/generate_expected_output.py @@ -252,7 +252,7 @@ def testEnv(testname, "watchdog": { "QTEST_FUNCTION_TIMEOUT": "100" }, }, # Must match tst_Selftests::runSubTest_data(): - crashers = ("assert", "blacklisted", "crashes", "crashedterminate", + crashers = ("assert", "crashes", "crashedterminate", "exceptionthrow", "faildatatype", "failfetchtype", "fetchbogus", "silent", "watchdog")): """Determine the environment in which to run a test.""" diff --git a/tests/auto/testlib/selftests/tst_selftests.cpp b/tests/auto/testlib/selftests/tst_selftests.cpp index 8f228a7b85e..5ff1304ec2a 100644 --- a/tests/auto/testlib/selftests/tst_selftests.cpp +++ b/tests/auto/testlib/selftests/tst_selftests.cpp @@ -765,8 +765,7 @@ void checkErrorOutput(const QString &test, const QByteArray &errorOutput) return; #ifdef Q_CC_MINGW - if (test == "blacklisted" // calls qFatal() - || test == "silent") // calls qFatal() + if (test == "silent") // calls qFatal() return; #endif @@ -787,7 +786,6 @@ void checkErrorOutput(const QString &test, const QByteArray &errorOutput) // QEMU outputs to stderr about uncaught signals if (QTestPrivate::isRunningArmOnX86() && (test == "assert" - || test == "blacklisted" || test == "crashes" || test == "faildatatype" || test == "failfetchtype" @@ -980,8 +978,7 @@ TestProcessResult runTestProcess(const QString &test, const QStringList &argumen const bool expectedCrash = test == "assert" || test == "exceptionthrow" || test == "fetchbogus" || test == "crashedterminate" || test == "faildatatype" || test == "failfetchtype" - || test == "crashes" || test == "silent" - || test == "blacklisted" || test == "watchdog"; + || test == "crashes" || test == "silent" || test == "watchdog"; if (expectedCrash) { environment.insert("QTEST_DISABLE_CORE_DUMP", "1");