summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2016-04-08 09:07:49 +0200
committerLiang Qi <liang.qi@theqtcompany.com>2016-04-08 18:18:36 +0000
commit40924657e9e5a8f40182be784cc07a70302e1824 (patch)
tree4b9672fe64482eab57ff81a22a1be28261fb3efd
parentc8eed01f1ffe5ad03a82d0bb7c49b71d5cec09b3 (diff)
downloadqtmultimedia-40924657e9e5a8f40182be784cc07a70302e1824.tar.gz
tests: skip tst_qaudiodecoderbackend when no audio decoding support
Task-number: QTBUG-46331 Change-Id: I9168ae7d89869cc0811394fc4091a5e44c136b9b Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
-rw-r--r--tests/auto/integration/qaudiodecoderbackend/BLACKLIST41
-rw-r--r--tests/auto/integration/qaudiodecoderbackend/tst_qaudiodecoderbackend.cpp8
2 files changed, 8 insertions, 41 deletions
diff --git a/tests/auto/integration/qaudiodecoderbackend/BLACKLIST b/tests/auto/integration/qaudiodecoderbackend/BLACKLIST
deleted file mode 100644
index 038b89022..000000000
--- a/tests/auto/integration/qaudiodecoderbackend/BLACKLIST
+++ /dev/null
@@ -1,41 +0,0 @@
-# QTBUG-46331
-
-[fileTest]
-opensuse-13.1 64bit
-redhatenterpriselinuxworkstation-6.6
-osx-10.8
-osx-10.9
-osx-10.10
-osx-10.11
-windows 32bit developer-build
-windows 64bit developer-build
-
-[unsupportedFileTest]
-opensuse-13.1 64bit
-redhatenterpriselinuxworkstation-6.6
-osx-10.8
-osx-10.9
-osx-10.10
-osx-10.11
-windows 32bit developer-build
-windows 64bit developer-build
-
-[corruptedFileTest]
-opensuse-13.1 64bit
-redhatenterpriselinuxworkstation-6.6
-osx-10.8
-osx-10.9
-osx-10.10
-osx-10.11
-windows 32bit developer-build
-windows 64bit developer-build
-
-[deviceTest]
-opensuse-13.1 64bit
-redhatenterpriselinuxworkstation-6.6
-osx-10.8
-osx-10.9
-osx-10.10
-osx-10.11
-windows 32bit developer-build
-windows 64bit developer-build
diff --git a/tests/auto/integration/qaudiodecoderbackend/tst_qaudiodecoderbackend.cpp b/tests/auto/integration/qaudiodecoderbackend/tst_qaudiodecoderbackend.cpp
index a52324d1a..562fe7ada 100644
--- a/tests/auto/integration/qaudiodecoderbackend/tst_qaudiodecoderbackend.cpp
+++ b/tests/auto/integration/qaudiodecoderbackend/tst_qaudiodecoderbackend.cpp
@@ -78,6 +78,8 @@ void tst_QAudioDecoderBackend::cleanup()
void tst_QAudioDecoderBackend::fileTest()
{
QAudioDecoder d;
+ if (d.error() == QAudioDecoder::ServiceMissingError)
+ QSKIP("There is no audio decoding support on this platform.");
QAudioBuffer buffer;
quint64 duration = 0;
int byteCount = 0;
@@ -260,6 +262,8 @@ void tst_QAudioDecoderBackend::fileTest()
void tst_QAudioDecoderBackend::unsupportedFileTest()
{
QAudioDecoder d;
+ if (d.error() == QAudioDecoder::ServiceMissingError)
+ QSKIP("There is no audio decoding support on this platform.");
QAudioBuffer buffer;
QVERIFY(d.state() == QAudioDecoder::StoppedState);
@@ -336,6 +340,8 @@ void tst_QAudioDecoderBackend::unsupportedFileTest()
void tst_QAudioDecoderBackend::corruptedFileTest()
{
QAudioDecoder d;
+ if (d.error() == QAudioDecoder::ServiceMissingError)
+ QSKIP("There is no audio decoding support on this platform.");
QAudioBuffer buffer;
QVERIFY(d.state() == QAudioDecoder::StoppedState);
@@ -408,6 +414,8 @@ void tst_QAudioDecoderBackend::corruptedFileTest()
void tst_QAudioDecoderBackend::deviceTest()
{
QAudioDecoder d;
+ if (d.error() == QAudioDecoder::ServiceMissingError)
+ QSKIP("There is no audio decoding support on this platform.");
QAudioBuffer buffer;
quint64 duration = 0;
int sampleCount = 0;