AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Dodge qFatal() so as to get coverage results despite it

Browse Source 
The silent and blacklisted selftests of testlib end in a qFatal(), to
test its messaging is handled correctly.  However, this prevents hooks
in main() from saving coverage data when we're gathering that.  So use
a transient signal handler that longjmp()s back to a setjmp() just
before the qFatal() to let the test complete normally (but, since
qFatal() does something different on MS-Win, don't apply this to it).

Note that testlib's internal FatalSignalHandler handles all fatal
signals *except* SIGABRT, so this isn't over-riding it.  (In any case,
this restores the prior signal handler in setjmp()'s catch branch.)

Added missing expected_silent.tap test output while checking that this
change doesn't affect (the rest of) the test output.

Change-Id: I7e460581ad93e26639c066b3229438a66fd299de
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Edward Welbourne 2018-11-20 19:57:25 +01:00
parent 9332f8cb72
commit f20adcde30
3 changed files with 82 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp
View File

@ -75,6 +75,17 @@ void tst_Blacklisted::xpass()
QVERIFY2(true, "This test should XPASS, blacklist ignored for XPASS");
}
#ifndef Q_OS_WIN
#include <signal.h>
#include <setjmp.h>
static jmp_buf state;
static void abort_handler(int signal)
{
longjmp(state, 1);
}
#endif
void tst_Blacklisted::messages()
{
qWarning("This is a warning that should not appear in silent test output");
@ -83,7 +94,15 @@ void tst_Blacklisted::messages()
qCritical("This is a critical message that should not appear in silent test output");
qInfo("This is an info message that should not appear in silent test output");
QTestLog::info("This is an internal testlib info message that should not appear in silent test output", __FILE__, __LINE__);
qFatal("This is a fatal error message that should still appear in silent test output");
#ifndef Q_OS_WIN
// We're testing qFatal, but we don't want to actually std::abort() !
auto prior = signal(SIGABRT, abort_handler);
if (setjmp(state))
signal(SIGABRT, prior);
else
#endif
qFatal("This is a fatal error message that should still appear in silent test output");
}
QTEST_MAIN(tst_Blacklisted)

42
tests/auto/testlib/selftests/expected_silent.tap Normal file
View File

@ -0,0 +1,42 @@
TAP version 13
# tst_Silent
ok 1 - initTestCase()
ok 2 - pass()
ok 3 - skip() # SKIP This test should skip
not ok 4 - fail()
---
type: QVERIFY
message: This test should fail
wanted: true (false)
found: false (false)
expected: true (false)
actual: false (false)
at: tst_Silent::fail() (qtbase/tests/auto/testlib/selftests/silent/tst_silent.cpp:60)
file: qtbase/tests/auto/testlib/selftests/silent/tst_silent.cpp
line: 60
...
not ok 5 - xfail() # TODO This test should XFAIL
---
at: tst_Silent::xfail() (qtbase/tests/auto/testlib/selftests/silent/tst_silent.cpp:66)
file: qtbase/tests/auto/testlib/selftests/silent/tst_silent.cpp
line: 66
...
ok 6 - xpass() # TODO 'true' returned TRUE unexpectedly. (This test should XPASS)
# This is a warning that should not appear in silent test output
# This is an internal testlib warning that should not appear in silent test output
# This is a debug message that should not appear in silent test output
# This is a critical message that should not appear in silent test output
# This is an info message that should not appear in silent test output
# This is an internal testlib info message that should not appear in silent test output
# This is a fatal error message that should still appear in silent test output
not ok 7 - messages()
---
# Received a fatal error.
at: tst_Silent::messages() (Unknown file:0)
file: Unknown file
line: 0
...
1..7
# tests 7
# pass 3
# fail 3

21
tests/auto/testlib/selftests/silent/tst_silent.cpp
View File

@ -72,6 +72,17 @@ void tst_Silent::xpass()
QVERIFY2(true, "This test should XPASS");
}
#ifndef Q_OS_WIN
#include <signal.h>
#include <setjmp.h>
static jmp_buf state;
static void abort_handler(int signal)
{
longjmp(state, 1);
}
#endif
void tst_Silent::messages()
{
qWarning("This is a warning that should not appear in silent test output");
@ -80,7 +91,15 @@ void tst_Silent::messages()
qCritical("This is a critical message that should not appear in silent test output");
qInfo("This is an info message that should not appear in silent test output");
QTestLog::info("This is an internal testlib info message that should not appear in silent test output", __FILE__, __LINE__);
qFatal("This is a fatal error message that should still appear in silent test output");
#ifndef Q_OS_WIN
// We're testing qFatal, but we don't want to actually std::abort() !
auto prior = signal(SIGABRT, abort_handler);
if (setjmp(state))
signal(SIGABRT, prior);
else
#endif
qFatal("This is a fatal error message that should still appear in silent test output");
}
QTEST_MAIN(tst_Silent)