summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorVaL Doroshchuk <valentyn.doroshchuk@qt.io>2020-03-04 15:56:09 +0100
committerVaL Doroshchuk <valentyn.doroshchuk@qt.io>2020-03-13 10:53:16 +0100
commit060e2e7846441a65bfdab5cf0afea008b1bbb13f (patch)
treed48b3f8690f1a693620ec8f705f2c1d2b149b68b /tests/auto
parent7f0a20ad066020d913faff636b8a0c5f61d2dfe0 (diff)
Skip all tst_QMediaPlayerBackend tests when there is no codec available
Previously tst_QMediaPlayerBackend::isWavSupported() always returned true unless boot2q env, which is not correct. Since if there is no codec installed in CI (but it is not boot2qt), also need to skip the tests. Change-Id: Ib58864bb3648a3d8f6c99354034f4ad85d5e4f98 Fixes: QTBUG-82673 Reviewed-by: Asmo Saarela <asmo.saarela@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Andy Shaw <andy.shaw@qt.io>
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/integration/qmediaplayerbackend/qmediaplayerbackend.pro2
-rw-r--r--tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp4
2 files changed, 0 insertions, 6 deletions
diff --git a/tests/auto/integration/qmediaplayerbackend/qmediaplayerbackend.pro b/tests/auto/integration/qmediaplayerbackend/qmediaplayerbackend.pro
index b9417f7c2..6dd1e8d62 100644
--- a/tests/auto/integration/qmediaplayerbackend/qmediaplayerbackend.pro
+++ b/tests/auto/integration/qmediaplayerbackend/qmediaplayerbackend.pro
@@ -15,8 +15,6 @@ HEADERS += \
TESTDATA += testdata/*
boot2qt: {
- # Yocto sysroot does not have gstreamer/wav
- QMAKE_CXXFLAGS += -DWAV_SUPPORT_NOT_FORCED
# OGV testing is unstable with qemu
QMAKE_CXXFLAGS += -DSKIP_OGV_TEST
}
diff --git a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
index 9cd3b7fa9..af4e2c275 100644
--- a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
+++ b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
@@ -177,11 +177,7 @@ QMediaContent tst_QMediaPlayerBackend::selectVideoFile(const QStringList& mediaC
bool tst_QMediaPlayerBackend::isWavSupported()
{
-#ifdef WAV_SUPPORT_NOT_FORCED
return !localWavFile.isNull();
-#else
- return true;
-#endif
}
void tst_QMediaPlayerBackend::initTestCase()