summaryrefslogtreecommitdiffstats
path: root/tests/auto/dbus
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@digia.com>2014-09-15 15:39:36 +0200
committerLars Knoll <lars.knoll@digia.com>2014-09-21 20:58:41 +0200
commit10414444e1fdc3b91328aba19fb10bd92f6dc899 (patch)
tree382677984b22b3d96254373926859b6a7f73803e /tests/auto/dbus
parent23a03ebcd17be328508e749afeb2cd962296be3b (diff)
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>
Diffstat (limited to 'tests/auto/dbus')
-rw-r--r--tests/auto/dbus/qdbusxmlparser/tst_qdbusxmlparser.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/auto/dbus/qdbusxmlparser/tst_qdbusxmlparser.cpp b/tests/auto/dbus/qdbusxmlparser/tst_qdbusxmlparser.cpp
index 8c94f87fd6..f32037de38 100644
--- a/tests/auto/dbus/qdbusxmlparser/tst_qdbusxmlparser.cpp
+++ b/tests/auto/dbus/qdbusxmlparser/tst_qdbusxmlparser.cpp
@@ -79,9 +79,8 @@ QT_END_NAMESPACE
void tst_QDBusXmlParser::initTestCase()
{
- // If the seed not initialized yet (-1), set it to 0
- // otherwise abort, so we don't get unexplained test failures later.
- QVERIFY(qt_qhash_seed.testAndSetRelaxed(-1, 0));
+ // Always initialize the hash seed to 0 to get reliable test results
+ qt_qhash_seed.store(0);
}
void tst_QDBusXmlParser::parsing_data()