From 23382669b9d9c15a3fc93fb43384035a9e788aa5 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 22 Dec 2011 15:01:40 +0100 Subject: [PATCH] QTestLib-selftest: Unblock on Windows. Do not run tests that pop up assert boxes. Change-Id: Idac94398ff1109605eb33a042dab734eafb1a17a Reviewed-by: Sergio Ahumada --- tests/auto/testlib/selftests/tst_selftests.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/auto/testlib/selftests/tst_selftests.cpp b/tests/auto/testlib/selftests/tst_selftests.cpp index 7825ade..cb03611 100644 --- a/tests/auto/testlib/selftests/tst_selftests.cpp +++ b/tests/auto/testlib/selftests/tst_selftests.cpp @@ -322,7 +322,7 @@ void tst_Selftests::runSubTest_data() << "datatable" << "datetime" << "differentexec" -#if !defined(QT_NO_EXCEPTIONS) && (!defined(Q_CC_INTEL) || !defined(Q_OS_WIN)) +#if !defined(QT_NO_EXCEPTIONS) && !defined(Q_CC_INTEL) && !defined(Q_OS_WIN) // Disable this test on Windows and for intel compiler, as the run-times // will popup dialogs with warnings that uncaught exceptions were thrown << "exceptionthrow" @@ -330,7 +330,10 @@ void tst_Selftests::runSubTest_data() << "expectfail" << "failinit" << "failinitdata" +#if !defined(Q_OS_WIN) + // Disable this test on Windows, as the run-time will popup dialogs with warnings << "fetchbogus" +#endif << "float" << "globaldata" << "longstring" -- 2.7.4