aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorRobin Burchell <robin.burchell@crimson.no>2017-04-22 16:49:04 +0200
committerRobin Burchell <robin.burchell@crimson.no>2017-04-22 15:06:20 +0000
commit75a4dccaefbd8cb9bb6ebb5b94f79c86f12832fd (patch)
tree8d5f0c2b45bc1cd03c73b783e06e1f63677dfa1b /tests/auto
parente0d7d2b342faa600069d7780a6eddc86687aeafb (diff)
Re-blacklist an unstable test
I accidentally attributed this to the wrong BLACKLIST in 186cbe30939947e3a2d33b250fc861cbee361dfe, which meant that it was running incorrectly. Change-Id: I64b9d322829736da0a05b03ccacb4e08fff863df Task-number: QTBUG-60343 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/qmltest/itemgrabber/BLACKLIST4
-rw-r--r--tests/auto/qmltest/selftests/BLACKLIST4
2 files changed, 3 insertions, 5 deletions
diff --git a/tests/auto/qmltest/itemgrabber/BLACKLIST b/tests/auto/qmltest/itemgrabber/BLACKLIST
deleted file mode 100644
index ae7967918c..0000000000
--- a/tests/auto/qmltest/itemgrabber/BLACKLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-# Blacklist for testing
-[tst_grabImage::test_equals]
-linux
-
diff --git a/tests/auto/qmltest/selftests/BLACKLIST b/tests/auto/qmltest/selftests/BLACKLIST
index e6945d8a48..9cb2313810 100644
--- a/tests/auto/qmltest/selftests/BLACKLIST
+++ b/tests/auto/qmltest/selftests/BLACKLIST
@@ -3,4 +3,6 @@
*
[SelfTests::test_blacklistWithData:test2]
*
-
+# QTBUG-53793: seems to be failing on Linux a little too often...
+[tst_grabImage::test_equals]
+linux