Add support for blacklisting test functions

We need to have a finer grained control over the tests
we skip in our CI system. This adds a blacklisting
mechanism that allows blacklisting individual test
functions (or even test data) using a set of predefined
matching keys for the operating system and some other
relevant variables.

QTestlib will search for a file called BLACKLIST in the test
directory and parse it if found. The file contains a simple
ini style list of functions to blacklist. For details see
qtestblacklist.cpp.

Change-Id: Id3fae4b264ca99970cbf9f45bfb85fa75c1fd823
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

1 files changed, 8 insertions, 0 deletions

diff --git a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
index da65ea105e..60274b2722 100644
--- a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
+++ b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
@@ -52,6 +52,7 @@
 #include <float.h>
 
 #include <qlocale.h>
+#include <private/qlocale_p.h>
 #include <qnumeric.h>
 
 #if defined(Q_OS_LINUX) && !defined(__UCLIBC__)
@@ -1544,6 +1545,9 @@ public:
         setWinLocaleInfo(LOCALE_SSHORTDATE, m_sdate);
         setWinLocaleInfo(LOCALE_SLONGDATE, m_ldate);
         setWinLocaleInfo(shortTimeType(), m_time);
+
+        // make sure QLocale::system() gets updated
+        QLocalePrivate::updateSystemPrivate();
     }
 
     QString m_decimal, m_thousand, m_sdate, m_ldate, m_time;
@@ -1567,7 +1571,11 @@ void tst_QLocale::windowsDefaultLocale()
     setWinLocaleInfo(LOCALE_SLONGDATE, longDateFormat);
     const QString shortTimeFormat = QStringLiteral("h^m^s");
     setWinLocaleInfo(shortTimeType(), shortTimeFormat);
+
+    // make sure QLocale::system() gets updated
+    QLocalePrivate::updateSystemPrivate();
     QLocale locale = QLocale::system();
+
     // make sure we are seeing the system's format strings
     QCOMPARE(locale.decimalPoint(), QChar('@'));
     QCOMPARE(locale.groupSeparator(), QChar('?'));