summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaroline Chao <caroline.chao@theqtcompany.com>2015-04-10 11:25:02 +0200
committerCaroline Chao <caroline.chao@theqtcompany.com>2015-04-28 12:35:21 +0000
commit1576f62eaf962aaaaba83337284d23c732bfb52b (patch)
treeab861bff0832267de1b0b1f82de4d46bba907710
parent84b739158d5fdc356e5c6c963ba740fd081db82e (diff)
Tests: Use blacklist for failing tst_qfilesystemwatcher tests
Remove the insignificant_tests CONFIG option in favor of a BLACKLIST file. The tests blacklisted have been found using CI builds logs. Change-Id: I34374ed7269f941c330c65d97fe083c83d3df461 Task-number: QTBUG-33574 Task-number: QTBUG-30943 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
-rw-r--r--tests/auto/corelib/io/qfilesystemwatcher/BLACKLIST8
-rw-r--r--tests/auto/corelib/io/qfilesystemwatcher/qfilesystemwatcher.pro2
2 files changed, 8 insertions, 2 deletions
diff --git a/tests/auto/corelib/io/qfilesystemwatcher/BLACKLIST b/tests/auto/corelib/io/qfilesystemwatcher/BLACKLIST
new file mode 100644
index 0000000000..3ac0b9dff4
--- /dev/null
+++ b/tests/auto/corelib/io/qfilesystemwatcher/BLACKLIST
@@ -0,0 +1,8 @@
+# QTBUG-33574 QTBUG-30943
+[signalsEmittedAfterFileMoved]
+windows 32bit msvc-2010
+windows 64bit msvc
+[watchFileAndItsDirectory:native backend-testfile]
+osx
+[watchFileAndItsDirectory:native backend-specialchars]
+osx
diff --git a/tests/auto/corelib/io/qfilesystemwatcher/qfilesystemwatcher.pro b/tests/auto/corelib/io/qfilesystemwatcher/qfilesystemwatcher.pro
index 318e49a113..1faa089c6e 100644
--- a/tests/auto/corelib/io/qfilesystemwatcher/qfilesystemwatcher.pro
+++ b/tests/auto/corelib/io/qfilesystemwatcher/qfilesystemwatcher.pro
@@ -3,5 +3,3 @@ TARGET = tst_qfilesystemwatcher
QT = core testlib
SOURCES = tst_qfilesystemwatcher.cpp
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
-
-CONFIG += insignificant_test # QTBUG-33574