diff options
| author | VaL Doroshchuk <valentyn.doroshchuk@qt.io> | 2020-03-04 15:56:09 +0100 |
|---|---|---|
| committer | VaL Doroshchuk <valentyn.doroshchuk@qt.io> | 2020-03-24 21:06:21 +0000 |
| commit | c22f263c5d7bd602197215978d59e53d67a7dd6d (patch) | |
| tree | 7232ad4c5d18eaf3e3008310b45fe16eed5b7539 | |
| parent | 67cab3e01d4d26f95af2e202ad3fd16722b1c6c7 (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>
(cherry picked from commit 060e2e7846441a65bfdab5cf0afea008b1bbb13f)
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| -rw-r--r-- | tests/auto/integration/qmediaplayerbackend/qmediaplayerbackend.pro | 2 | ||||
| -rw-r--r-- | tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp | 4 |
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 25430a189..346d9c750 100644 --- a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp +++ b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp @@ -175,11 +175,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() |