3 files changed, 45 insertions, 2 deletions
diff --git a/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp b/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp
index 2f6d633e9d..49c08982ad 100644
--- a/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp
+++ b/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp
@@ -75,6 +75,17 @@ void tst_Blacklisted::xpass()
     QVERIFY2(true, "This test should BXPASS");
 }
 
+#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)
diff --git a/tests/auto/testlib/selftests/expected_crashes_5.txt b/tests/auto/testlib/selftests/expected_crashes_5.txt
new file mode 100644
index 0000000000..088b9c5324
--- /dev/null
+++ b/tests/auto/testlib/selftests/expected_crashes_5.txt
@@ -0,0 +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
diff --git a/tests/auto/testlib/selftests/silent/tst_silent.cpp b/tests/auto/testlib/selftests/silent/tst_silent.cpp
index 97fbbfd30a..cf3c35dec4 100644
--- a/tests/auto/testlib/selftests/silent/tst_silent.cpp
+++ b/tests/auto/testlib/selftests/silent/tst_silent.cpp
@@ -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)