diff options
| -rw-r--r-- | src/testlib/qtestcase.cpp | 45 | ||||
| -rw-r--r-- | tests/auto/testlib/selftests/expected_crashes_3.txt | 7 |
2 files changed, 41 insertions, 11 deletions
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index 6b5584366d..f55d4ba38f 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -2074,12 +2074,48 @@ private: # endif } - static void actionHandler(int signum, siginfo_t * /* info */, void * /* ucontext */) + template <typename T> static + std::enable_if_t<sizeof(std::declval<T>().si_pid) + sizeof(std::declval<T>().si_uid) >= 1> + printSentSignalInfo(T *info) + { + writeToStderr(" sent by PID ", asyncSafeToString(info->si_pid), + " UID ", asyncSafeToString(info->si_uid)); + } + static void printSentSignalInfo(...) {} + + template <typename T> static + std::enable_if_t<sizeof(std::declval<T>().si_addr) >= 1> printCrashingSignalInfo(T *info) + { + using HexString = std::array<char, sizeof(quintptr) * 2>; + auto toHexString = [](quintptr u, HexString &&r = {}) { + int shift = sizeof(quintptr) * 8 - 4; + for (size_t i = 0; i < sizeof(quintptr) * 2; ++i, shift -= 4) + r[i] = QtMiscUtils::toHexLower(u >> shift); + struct iovec vec; + vec.iov_base = r.data(); + vec.iov_len = r.size(); + return vec; + }; + writeToStderr(", code ", asyncSafeToString(info->si_code), + ", for address 0x", toHexString(quintptr(info->si_addr))); + } + static void printCrashingSignalInfo(...) {} + + static void actionHandler(int signum, siginfo_t *info, void * /* ucontext */) { writeToStderr("Received signal ", asyncSafeToString(signum), - " (SIG", signalName(signum), ")\n"); - printTestRunTime(); + " (SIG", signalName(signum), ")"); + bool isCrashingSignal = + std::find(crashingSignals.begin(), crashingSignals.end(), signum) != crashingSignals.end(); + if (isCrashingSignal && (!info || info->si_code <= 0)) + isCrashingSignal = false; // wasn't sent by the kernel, so it's not really a crash + if (isCrashingSignal) + printCrashingSignalInfo(info); + else if (info && (info->si_code == SI_USER || info->si_code == SI_QUEUE)) + printSentSignalInfo(info); + + printTestRunTime(); if (signum != SIGINT) { generateStackTrace(); if (pauseOnCrash) { @@ -2089,9 +2125,6 @@ private: } } - bool isCrashingSignal = - std::find(crashingSignals.begin(), crashingSignals.end(), signum) != crashingSignals.end(); - // chain back to the previous handler, if any for (size_t i = 0; i < fatalSignals.size(); ++i) { struct sigaction &act = oldActions()[i]; diff --git a/tests/auto/testlib/selftests/expected_crashes_3.txt b/tests/auto/testlib/selftests/expected_crashes_3.txt index c32ea53675..b0d69009d1 100644 --- a/tests/auto/testlib/selftests/expected_crashes_3.txt +++ b/tests/auto/testlib/selftests/expected_crashes_3.txt @@ -1,8 +1,5 @@ ********* Start testing of tst_Crashes ********* Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ PASS : tst_Crashes::initTestCase() -QFATAL : tst_Crashes::crash() Received signal 11 - Function time: ms Total time: ms -FAIL! : tst_Crashes::crash() Received a fatal error. -Totals: 1 passed, 1 failed, 0 skipped, 0 blacklisted -********* Finished testing of tst_Crashes ********* +Received signal 11 (SIGSEGV), code 1, for address 0x0000000000000004 + Function time: ms, total time: ms |