summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorYoann Lopes <yoann.lopes@theqtcompany.com>2015-11-23 17:44:01 +0100
committerYoann Lopes <yoann.lopes@theqtcompany.com>2015-11-23 17:44:51 +0100
commit0757ff1c4add6bd4f6499c04969760765662efa3 (patch)
tree1c86054c53ee65fbfa69b670830a61fe9db1f6ab /tests/auto
parent11df4e75e4eca82d28dc147fcefb29d62b38a5dc (diff)
parent9937c67decc5b81eaa25fff8d773cc7c2e6ff838 (diff)
Merge remote-tracking branch 'origin/5.6' into dev
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/integration/qmediaplayerbackend/BLACKLIST20
1 files changed, 12 insertions, 8 deletions
diff --git a/tests/auto/integration/qmediaplayerbackend/BLACKLIST b/tests/auto/integration/qmediaplayerbackend/BLACKLIST
index dd6dd14b8..b9907f305 100644
--- a/tests/auto/integration/qmediaplayerbackend/BLACKLIST
+++ b/tests/auto/integration/qmediaplayerbackend/BLACKLIST
@@ -8,16 +8,13 @@ windows 64bit developer-build
[construction]
opensuse-13.1 64bit
-redhatenterpriselinuxworkstation-6.6
[loadMedia]
opensuse-13.1 64bit
-redhatenterpriselinuxworkstation-6.6
windows 64bit developer-build
[unloadMedia]
opensuse-13.1 64bit
-redhatenterpriselinuxworkstation-6.6
windows 64bit developer-build
[playPauseStop]
@@ -28,27 +25,34 @@ windows 64bit developer-build
[processEOS]
opensuse-13.1 64bit
-redhatenterpriselinuxworkstation-6.6
windows 64bit developer-build
[deleteLaterAtEOS]
opensuse-13.1 64bit
-redhatenterpriselinuxworkstation-6.6
windows 64bit developer-build
[volumeAndMuted]
opensuse-13.1 64bit
-redhatenterpriselinuxworkstation-6.6
[volumeAcrossFiles]
opensuse-13.1 64bit
-redhatenterpriselinuxworkstation-6.6
[initialVolume]
opensuse-13.1 64bit
-redhatenterpriselinuxworkstation-6.6
windows 64bit developer-build
[playlist]
opensuse-13.1 64bit
redhatenterpriselinuxworkstation-6.6
+
+[seekPauseSeek]
+redhatenterpriselinuxworkstation-6.6
+
+[subsequentPlayback]
+redhatenterpriselinuxworkstation-6.6
+
+[probes]
+redhatenterpriselinuxworkstation-6.6
+
+[surfaceTest]
+redhatenterpriselinuxworkstation-6.6