Merge commit 'dev' into 'wip/cmake-merge'

Change-Id: I176c40d031be26a1dd1cf08843e448a660598783

1 files changed, 25 insertions, 5 deletions

diff --git a/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp b/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp
index 8578752e22..49c08982ad 100644
--- a/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp
+++ b/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp
@@ -45,7 +45,8 @@ private slots:
     void messages();
 };
 
-// All the tests below have been blacklisted in blacklisted/BLACKLIST
+// All the tests below except pass() have been blacklisted in blacklisted/BLACKLIST
+// Contrast with ../silent/, for the same tests without blacklisting but with -silent
 
 void tst_Blacklisted::pass()
 {
@@ -64,16 +65,27 @@ void tst_Blacklisted::fail()
 
 void tst_Blacklisted::xfail()
 {
-    QEXPECT_FAIL("", "This test should XFAIL then BFAIL", Abort);
+    QEXPECT_FAIL("", "This test should BXFAIL then BPASS", Abort);
     QVERIFY(false);
 }
 
 void tst_Blacklisted::xpass()
 {
-    QEXPECT_FAIL("", "This test should XPASS", Abort);
-    QVERIFY2(true, "This test should XPASS, blacklist ignored for XPASS");
+    QEXPECT_FAIL("", "This test should BXPASS", Abort);
+    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");
@@ -82,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)