summaryrefslogtreecommitdiffstats
path: root/tests/auto/integration
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@theqtcompany.com>2015-07-22 08:38:06 +0200
committerSimon Hausmann <simon.hausmann@theqtcompany.com>2015-07-23 12:02:35 +0000
commit82069d0527ee7c2c081d23c8e5913d31c9a92e4f (patch)
tree2e15807a9a9facb2febe4b94d0021e6b7dfa7eea /tests/auto/integration
parentc4a1af736de87f9b7e03010d2610bb4b748087c2 (diff)
Extend test exclusion for this test on OS X
The test doesn't work on OS X 10.9 and 10.10. It also doesn't work on OS X 10.8, but the current CI system doesn't actually run tests on 10.8. In the (future) event of us running tests on 10.8, this change is required. Change-Id: I6cbe6249aee2460353322d6f1254858238af3711 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
Diffstat (limited to 'tests/auto/integration')
-rw-r--r--tests/auto/integration/qaudiodecoderbackend/BLACKLIST4
-rw-r--r--tests/auto/integration/qmediaplayerbackend/BLACKLIST1
2 files changed, 5 insertions, 0 deletions
diff --git a/tests/auto/integration/qaudiodecoderbackend/BLACKLIST b/tests/auto/integration/qaudiodecoderbackend/BLACKLIST
index 4937e472d..bd2349568 100644
--- a/tests/auto/integration/qaudiodecoderbackend/BLACKLIST
+++ b/tests/auto/integration/qaudiodecoderbackend/BLACKLIST
@@ -3,6 +3,7 @@
[fileTest]
opensuse-13.1 64bit
redhatenterpriselinuxworkstation-6.6
+osx-10.8
osx-10.9
osx-10.10
windows 32bit developer-build
@@ -11,6 +12,7 @@ windows 64bit developer-build
[unsupportedFileTest]
opensuse-13.1 64bit
redhatenterpriselinuxworkstation-6.6
+osx-10.8
osx-10.9
osx-10.10
windows 32bit developer-build
@@ -19,6 +21,7 @@ windows 64bit developer-build
[corruptedFileTest]
opensuse-13.1 64bit
redhatenterpriselinuxworkstation-6.6
+osx-10.8
osx-10.9
osx-10.10
windows 32bit developer-build
@@ -27,6 +30,7 @@ windows 64bit developer-build
[deviceTest]
opensuse-13.1 64bit
redhatenterpriselinuxworkstation-6.6
+osx-10.8
osx-10.9
osx-10.10
windows 32bit developer-build
diff --git a/tests/auto/integration/qmediaplayerbackend/BLACKLIST b/tests/auto/integration/qmediaplayerbackend/BLACKLIST
index 047fe35e5..881919b77 100644
--- a/tests/auto/integration/qmediaplayerbackend/BLACKLIST
+++ b/tests/auto/integration/qmediaplayerbackend/BLACKLIST
@@ -1,5 +1,6 @@
# QTBUG-46368
+osx-10.8
osx-10.9
osx-10.10
windows 32bit developer-build