1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correct some testlib selftest data: blacklisted does not qFatal()

Browse Source 
The blacklisted test does not crash, as its expected output indeed shows.

Pick-to: 6.5 6.6
Change-Id: I07522a7d065b5f39620975a3546bcd156024c41d
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Edward Welbourne 2023-04-26 13:43:08 +02:00
parent 118f2210c6
commit 5993480b69
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/testlib/selftests/generate_expected_output.py
View File

@ -252,7 +252,7 @@ def testEnv(testname,
"watchdog": { "QTEST_FUNCTION_TIMEOUT": "100" }, "watchdog": { "QTEST_FUNCTION_TIMEOUT": "100" },
}, },
# Must match tst_Selftests::runSubTest_data(): # Must match tst_Selftests::runSubTest_data():
crashers = ("assert", "blacklisted", "crashes", "crashedterminate", crashers = ("assert", "crashes", "crashedterminate",
"exceptionthrow", "faildatatype", "failfetchtype", "exceptionthrow", "faildatatype", "failfetchtype",
"fetchbogus", "silent", "watchdog")): "fetchbogus", "silent", "watchdog")):
"""Determine the environment in which to run a test.""" """Determine the environment in which to run a test."""

7
tests/auto/testlib/selftests/tst_selftests.cpp
View File

@ -765,8 +765,7 @@ void checkErrorOutput(const QString &test, const QByteArray &errorOutput)
return; return;
#ifdef Q_CC_MINGW #ifdef Q_CC_MINGW
if (test == "blacklisted" // calls qFatal() if (test == "silent") // calls qFatal()
|| test == "silent") // calls qFatal()
return; return;
#endif #endif
@ -787,7 +786,6 @@ void checkErrorOutput(const QString &test, const QByteArray &errorOutput)
// QEMU outputs to stderr about uncaught signals // QEMU outputs to stderr about uncaught signals
if (QTestPrivate::isRunningArmOnX86() && if (QTestPrivate::isRunningArmOnX86() &&
(test == "assert" (test == "assert"
|| test == "blacklisted"
|| test == "crashes" || test == "crashes"
|| test == "faildatatype" || test == "faildatatype"
|| test == "failfetchtype" || test == "failfetchtype"
@ -980,8 +978,7 @@ TestProcessResult runTestProcess(const QString &test, const QStringList &argumen
const bool expectedCrash = test == "assert" || test == "exceptionthrow" const bool expectedCrash = test == "assert" || test == "exceptionthrow"
|| test == "fetchbogus" || test == "crashedterminate" || test == "fetchbogus" || test == "crashedterminate"
|| test == "faildatatype" || test == "failfetchtype" || test == "faildatatype" || test == "failfetchtype"
|| test == "crashes" || test == "silent" || test == "crashes" || test == "silent" || test == "watchdog";
|| test == "blacklisted" || test == "watchdog";
if (expectedCrash) { if (expectedCrash) {
environment.insert("QTEST_DISABLE_CORE_DUMP", "1"); environment.insert("QTEST_DISABLE_CORE_DUMP", "1");