From 55dbb7b90c32442c4fb9a16563990913ec0468f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Arve=20S=C3=A6ther?= Date: Thu, 18 Jul 2019 15:22:49 +0200 Subject: Fix tst_qqmlapplicationengine failures for Android The tests doesn't make much sense on Android so we just skip them Change-Id: Ie93858f7041657d6e6d05229454f970a761efc0b Reviewed-by: Simon Hausmann --- tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'tests/auto/qml/qqmlapplicationengine') diff --git a/tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp b/tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp index a9c28a0911..8787a43884 100644 --- a/tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp +++ b/tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp @@ -96,6 +96,9 @@ void tst_qqmlapplicationengine::basicLoading() // will break. void tst_qqmlapplicationengine::testNonResolvedPath() { +#ifdef Q_OS_ANDROID + QSKIP("Android stores QML files in resources, and the path to a resource cannot be relative in this case"); +#endif { // NOTE NOTE NOTE! Missing testFileUrl is *WANTED* here! We want a // non-resolved URL. @@ -117,6 +120,9 @@ void tst_qqmlapplicationengine::testNonResolvedPath() void tst_qqmlapplicationengine::application_data() { +#ifdef Q_OS_ANDROID + QSKIP("Cannot launch external process on Android"); +#endif QTest::addColumn("qmlFile"); QTest::addColumn("expectedStdErr"); -- cgit v1.2.3