From 01413cf1e63c735ef9d53d1e3979bf97fd2bc4d1 Mon Sep 17 00:00:00 2001 From: Sami Nurmenniemi Date: Fri, 8 Sep 2017 11:56:04 +0300 Subject: Skip OVG tests on boot2qt Loading OVG is unstable on qemu. That needs to be skipped for boot2qt tests. This will conflict when merging to branch 5.10 with commit c341b2b25697f937280fe3620629ac3d32c19613. Correct version is in 5.10. Task-number: QTBUG-63079 Change-Id: Ic691beb3dbbfdc64ca31b380ad85d9dadbe08a90 Reviewed-by: Simon Hausmann --- tests/auto/integration/qmediaplayerbackend/qmediaplayerbackend.pro | 5 +++++ .../auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp | 2 ++ 2 files changed, 7 insertions(+) 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(); -- cgit v1.2.3