aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAssam Boudjelthia <assam.boudjelthia@qt.io>2022-02-17 17:09:40 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-03-02 17:14:46 +0000
commit8858125b2439e24bcdcc7b27d9e28b99dcf0358b (patch)
treec8ff01e0b7be1d91da31e4bacd05f5e581cbf0aa
parent750817d52b4104817c8a695846a875d37c01452c (diff)
Disable failing declarative tests on Android - Part 2
This allows us to enable testing on declarative for the module as a whole and have some sort of test verification for the mean time, and fix the fails over time. This also disable tests like qdom and qjsscope which are host tests. Task-number: QTBUG-100991 Task-number: QTBUG-99194 Task-number: QTBUG-101005 Task-number: QTBUG-101006 Change-Id: Ie7ae5b8e0ccdf2f55ce3568091d513a073c48417 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 6c3373109fedf45b06c9c48355a80922fd754b31) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/qml/doc/snippets/qmltc/tst_qmltc_examples.cpp3
-rw-r--r--tests/auto/CMakeLists.txt2
-rw-r--r--tests/auto/qml/CMakeLists.txt4
-rw-r--r--tests/auto/quickcontrols2/CMakeLists.txt6
-rw-r--r--tests/auto/quickcontrols2/qquickiconimage/BLACKLIST15
-rw-r--r--tests/auto/quickdialogs/CMakeLists.txt2
6 files changed, 30 insertions, 2 deletions
diff --git a/src/qml/doc/snippets/qmltc/tst_qmltc_examples.cpp b/src/qml/doc/snippets/qmltc/tst_qmltc_examples.cpp
index 50436dc26f..2d619ebeea 100644
--- a/src/qml/doc/snippets/qmltc/tst_qmltc_examples.cpp
+++ b/src/qml/doc/snippets/qmltc/tst_qmltc_examples.cpp
@@ -177,6 +177,9 @@ void readFileContent(QStringList *content, const QString &url, Predicate filter)
void tst_qmltc_examples::helloWorld()
{
+#ifdef Q_OS_ANDROID
+ QSKIP("expected C++ files are not bundled with Android tests.");
+#endif
QStringList generatedCode;
readFileContent(&generatedCode,
QStringLiteral(QMLTC_TESTS_BINARY_DIR)
diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt
index f2d0ca547a..3ef1b6e735 100644
--- a/tests/auto/CMakeLists.txt
+++ b/tests/auto/CMakeLists.txt
@@ -23,7 +23,7 @@ endif()
if(TARGET Qt::QuickWidgets)
add_subdirectory(quickwidgets)
endif()
-if(TARGET Qt::QmlDomPrivate)
+if(TARGET Qt::QmlDomPrivate AND NOT CMAKE_CROSSCOMPILING)
add_subdirectory(qmldom)
add_subdirectory(qmlls)
endif()
diff --git a/tests/auto/qml/CMakeLists.txt b/tests/auto/qml/CMakeLists.txt
index 4c61f59736..caddfd2fe8 100644
--- a/tests/auto/qml/CMakeLists.txt
+++ b/tests/auto/qml/CMakeLists.txt
@@ -44,7 +44,9 @@ if(TARGET Qt::Quick)
(QT_BUILD_STANDALONE_TESTS OR QT6_IS_SHARED_LIBS_BUILD))
add_subdirectory(qmlbasicapp)
endif()
- add_subdirectory(qqmljsscope)
+ if(NOT CMAKE_CROSSCOMPILING)
+ add_subdirectory(qqmljsscope)
+ endif()
endif()
add_subdirectory(qmlsplitlib)
if(TARGET Qt::Widgets)
diff --git a/tests/auto/quickcontrols2/CMakeLists.txt b/tests/auto/quickcontrols2/CMakeLists.txt
index 06eecf6714..b3b655f2cd 100644
--- a/tests/auto/quickcontrols2/CMakeLists.txt
+++ b/tests/auto/quickcontrols2/CMakeLists.txt
@@ -1,7 +1,9 @@
# Generated from auto.pro.
add_subdirectory(accessibility)
+if(NOT ANDROID) # temporarily disabled until QTBUG-100991 is fixed
add_subdirectory(controls)
+endif()
add_subdirectory(cursor)
add_subdirectory(customization)
add_subdirectory(designer)
@@ -24,10 +26,14 @@ add_subdirectory(qquickiconlabel)
add_subdirectory(qquickimaginestyle)
add_subdirectory(qquickmaterialstyle)
add_subdirectory(qquickmaterialstyleconf)
+if(NOT ANDROID) # QTBUG-101005
add_subdirectory(qquickmenu)
+endif()
add_subdirectory(qquickmenubar)
add_subdirectory(qquickninepatchimage)
+if(NOT ANDROID) # QTBUG-101005
add_subdirectory(qquickpopup)
+endif()
add_subdirectory(qquickstyle)
add_subdirectory(qquickuniversalstyle)
add_subdirectory(qquickuniversalstyleconf)
diff --git a/tests/auto/quickcontrols2/qquickiconimage/BLACKLIST b/tests/auto/quickcontrols2/qquickiconimage/BLACKLIST
new file mode 100644
index 0000000000..70c935375d
--- /dev/null
+++ b/tests/auto/quickcontrols2/qquickiconimage/BLACKLIST
@@ -0,0 +1,15 @@
+# QTBUG-101006
+[nameBindingSourceSize]
+android
+[sourceBindingSourceSize]
+android
+[alignment]
+android
+[color]
+android
+[fileSelectors]
+android
+[imageProvider]
+android
+[translucentColors]
+android
diff --git a/tests/auto/quickdialogs/CMakeLists.txt b/tests/auto/quickdialogs/CMakeLists.txt
index a3b5f15cb3..a8541bb3d5 100644
--- a/tests/auto/quickdialogs/CMakeLists.txt
+++ b/tests/auto/quickdialogs/CMakeLists.txt
@@ -1,4 +1,6 @@
+if(NOT ANDROID) # temporarily disabled until QTBUG-100991 is fixed
add_subdirectory(qquickfiledialogimpl)
add_subdirectory(qquickfolderdialogimpl)
add_subdirectory(qquickfontdialogimpl)
+endif()
add_subdirectory(qquickmessagedialogimpl)