diff options
-rw-r--r-- | tests/auto/integration/qmediaplayerbackend/qmediaplayerbackend.pro | 5 | ||||
-rw-r--r-- | tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/tests/auto/integration/qmediaplayerbackend/qmediaplayerbackend.pro b/tests/auto/integration/qmediaplayerbackend/qmediaplayerbackend.pro index 87637fadc..919fae91d 100644 --- a/tests/auto/integration/qmediaplayerbackend/qmediaplayerbackend.pro +++ b/tests/auto/integration/qmediaplayerbackend/qmediaplayerbackend.pro @@ -10,3 +10,8 @@ SOURCES += \ tst_qmediaplayerbackend.cpp TESTDATA += testdata/* + +boot2qt: { + # 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 fb72a239c..5a703f2e1 100644 --- a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp +++ b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp @@ -221,7 +221,9 @@ void tst_QMediaPlayerBackend::initTestCase() QStringList mediaCandidates; mediaCandidates << QFINDTESTDATA("testdata/colors.mp4"); +#ifndef SKIP_OGV_TEST mediaCandidates << QFINDTESTDATA("testdata/colors.ogv"); +#endif localVideoFile = selectMediaFile(mediaCandidates); mediaCandidates.clear(); |