From 039d3fe4e884c3680cb21d89deba7857dde1269c Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Tue, 13 Oct 2020 14:36:18 +0300 Subject: [PATCH] Android: blacklist a list of failing tests for android We want to re-enable Android tests in QTQAINFRA-3867. However, many tests are failing already preventing that from happening. QTBUG-87025 is currently keeping track (links) to all of those failing tests. The current proposal is to hide those failing tests, and enable Android test running in COIN for other tests. After, that try to fix them one by one, and at the same time we can make sure no more failing tests go unnoticed. Task-number: QTBUG-87025 Change-Id: Ic1fe9fdd167cbcfd99efce9a09c69c344a36bbe4 Reviewed-by: Alexandru Croitor --- .../auto/corelib/kernel/.prev_CMakeLists.txt | 8 +++-- tests/auto/corelib/kernel/CMakeLists.txt | 5 +++- tests/auto/corelib/kernel/kernel.pro | 3 ++ .../auto/corelib/plugin/.prev_CMakeLists.txt | 6 ++-- tests/auto/corelib/plugin/CMakeLists.txt | 9 ++++-- tests/auto/corelib/plugin/plugin.pro | 9 ++++++ .../serialization/qdatastream/BLACKLIST | 3 ++ .../serialization/qtextstream/BLACKLIST | 7 +++++ tests/auto/corelib/text/CMakeLists.txt | 5 +++- tests/auto/corelib/text/qstring/BLACKLIST | 3 ++ .../corelib/text/qstringconverter/BLACKLIST | 3 ++ tests/auto/corelib/text/text.pro | 4 +++ .../auto/corelib/thread/.prev_CMakeLists.txt | 6 ++-- tests/auto/corelib/thread/CMakeLists.txt | 12 ++++++-- .../auto/corelib/thread/qatomicint/BLACKLIST | 3 ++ .../corelib/thread/qthreadstorage/BLACKLIST | 3 ++ tests/auto/corelib/thread/thread.pro | 6 ++++ tests/auto/corelib/time/qdate/BLACKLIST | 3 ++ tests/auto/corelib/time/qdatetime/BLACKLIST | 7 +++++ tests/auto/corelib/time/qtimezone/BLACKLIST | 11 +++++++ tests/auto/corelib/tools/.prev_CMakeLists.txt | 4 ++- tests/auto/corelib/tools/CMakeLists.txt | 5 +++- tests/auto/corelib/tools/tools.pro | 3 ++ tests/auto/gui/image/CMakeLists.txt | 8 +++-- tests/auto/gui/image/image.pro | 4 +++ .../gui/itemmodels/qfilesystemmodel/BLACKLIST | 3 ++ tests/auto/gui/kernel/qscreen/BLACKLIST | 3 ++ tests/auto/gui/kernel/qtouchevent/BLACKLIST | 6 ++++ tests/auto/gui/kernel/qwindow/BLACKLIST | 13 ++++++++ tests/auto/gui/painting/CMakeLists.txt | 5 +++- tests/auto/gui/painting/painting.pro | 4 ++- tests/auto/gui/qopengl/BLACKLIST | 3 ++ tests/auto/gui/rhi/qrhi/BLACKLIST | 3 ++ tests/auto/gui/text/qfontdatabase/BLACKLIST | 3 ++ .../kernel/qnetworkproxyfactory/BLACKLIST | 3 ++ .../auto/network/socket/.prev_CMakeLists.txt | 6 ++-- tests/auto/network/socket/CMakeLists.txt | 8 +++-- .../network/socket/qlocalsocket/BLACKLIST | 7 +++++ tests/auto/network/socket/socket.pro | 6 ++++ tests/auto/network/ssl/qsslkey/BLACKLIST | 5 ++++ tests/auto/other/.prev_CMakeLists.txt | 11 ++++--- tests/auto/other/CMakeLists.txt | 6 ++-- tests/auto/other/other.pro | 6 ++++ tests/auto/other/qfocusevent/BLACKLIST | 3 ++ tests/auto/other/toolsupport/BLACKLIST | 3 ++ tests/auto/widgets/dialogs/qdialog/BLACKLIST | 3 ++ .../widgets/dialogs/qfiledialog2/BLACKLIST | 5 ++++ tests/auto/widgets/dialogs/qwizard/BLACKLIST | 3 ++ .../graphicsview/qgraphicsview/BLACKLIST | 27 +++++++++++++++++ .../itemviews/qabstractitemview/BLACKLIST | 3 ++ .../widgets/itemviews/qheaderview/BLACKLIST | 3 ++ .../widgets/itemviews/qtableview/BLACKLIST | 7 +++++ .../widgets/itemviews/qtreeview/BLACKLIST | 5 ++++ tests/auto/widgets/kernel/CMakeLists.txt | 5 +++- tests/auto/widgets/kernel/kernel.pro | 4 +++ .../widgets/kernel/qapplication/BLACKLIST | 17 +++++++++++ .../auto/widgets/kernel/qformlayout/BLACKLIST | 3 ++ .../kernel/qgesturerecognizer/BLACKLIST | 3 ++ .../auto/widgets/kernel/qgridlayout/BLACKLIST | 3 ++ tests/auto/widgets/kernel/qwidget/BLACKLIST | 30 +++++++++++++++++++ .../widgets/kernel/qwidget_window/BLACKLIST | 15 ++++++++++ .../widgets/kernel/qwindowcontainer/BLACKLIST | 5 ++++ tests/auto/widgets/util/qscroller/BLACKLIST | 3 ++ tests/auto/widgets/widgets/CMakeLists.txt | 11 +++++-- .../widgets/widgets/qabstractbutton/BLACKLIST | 5 ++++ .../widgets/widgets/qdockwidget/BLACKLIST | 3 ++ .../auto/widgets/widgets/qlineedit/BLACKLIST | 15 ++++++++++ tests/auto/widgets/widgets/qmdiarea/BLACKLIST | 11 +++++++ .../widgets/widgets/qmdisubwindow/BLACKLIST | 19 ++++++++++++ tests/auto/widgets/widgets/qmenu/BLACKLIST | 17 +++++++++++ tests/auto/widgets/widgets/qmenubar/BLACKLIST | 3 ++ .../widgets/widgets/qopenglwidget/BLACKLIST | 5 ++++ .../widgets/widgets/qplaintextedit/BLACKLIST | 5 ++++ .../widgets/widgets/qprogressbar/BLACKLIST | 3 ++ .../widgets/widgets/qpushbutton/BLACKLIST | 3 ++ .../auto/widgets/widgets/qscrollbar/BLACKLIST | 3 ++ .../auto/widgets/widgets/qsizegrip/BLACKLIST | 5 ++++ .../auto/widgets/widgets/qsplitter/BLACKLIST | 5 ++++ .../auto/widgets/widgets/qstatusbar/BLACKLIST | 3 ++ .../widgets/widgets/qtextbrowser/BLACKLIST | 5 ++++ tests/auto/widgets/widgets/widgets.pro | 8 +++++ tests/auto/xml/CMakeLists.txt | 5 +++- tests/auto/xml/xml.pro | 3 ++ 83 files changed, 490 insertions(+), 38 deletions(-) create mode 100644 tests/auto/corelib/serialization/qdatastream/BLACKLIST create mode 100644 tests/auto/corelib/text/qstring/BLACKLIST create mode 100644 tests/auto/corelib/text/qstringconverter/BLACKLIST create mode 100644 tests/auto/corelib/thread/qatomicint/BLACKLIST create mode 100644 tests/auto/corelib/thread/qthreadstorage/BLACKLIST create mode 100644 tests/auto/corelib/time/qdate/BLACKLIST create mode 100644 tests/auto/corelib/time/qdatetime/BLACKLIST create mode 100644 tests/auto/gui/kernel/qscreen/BLACKLIST create mode 100644 tests/auto/gui/rhi/qrhi/BLACKLIST create mode 100644 tests/auto/network/kernel/qnetworkproxyfactory/BLACKLIST create mode 100644 tests/auto/network/socket/qlocalsocket/BLACKLIST create mode 100644 tests/auto/other/qfocusevent/BLACKLIST create mode 100644 tests/auto/other/toolsupport/BLACKLIST create mode 100644 tests/auto/widgets/dialogs/qwizard/BLACKLIST create mode 100644 tests/auto/widgets/itemviews/qtreeview/BLACKLIST create mode 100644 tests/auto/widgets/kernel/qformlayout/BLACKLIST create mode 100644 tests/auto/widgets/kernel/qgesturerecognizer/BLACKLIST create mode 100644 tests/auto/widgets/kernel/qgridlayout/BLACKLIST create mode 100644 tests/auto/widgets/kernel/qwindowcontainer/BLACKLIST create mode 100644 tests/auto/widgets/widgets/qabstractbutton/BLACKLIST create mode 100644 tests/auto/widgets/widgets/qdockwidget/BLACKLIST create mode 100644 tests/auto/widgets/widgets/qlineedit/BLACKLIST create mode 100644 tests/auto/widgets/widgets/qmdisubwindow/BLACKLIST create mode 100644 tests/auto/widgets/widgets/qplaintextedit/BLACKLIST create mode 100644 tests/auto/widgets/widgets/qprogressbar/BLACKLIST create mode 100644 tests/auto/widgets/widgets/qpushbutton/BLACKLIST create mode 100644 tests/auto/widgets/widgets/qscrollbar/BLACKLIST create mode 100644 tests/auto/widgets/widgets/qsizegrip/BLACKLIST create mode 100644 tests/auto/widgets/widgets/qsplitter/BLACKLIST create mode 100644 tests/auto/widgets/widgets/qstatusbar/BLACKLIST create mode 100644 tests/auto/widgets/widgets/qtextbrowser/BLACKLIST diff --git a/tests/auto/corelib/kernel/.prev_CMakeLists.txt b/tests/auto/corelib/kernel/.prev_CMakeLists.txt index 154cc8e7664..31e9a7bb168 100644 --- a/tests/auto/corelib/kernel/.prev_CMakeLists.txt +++ b/tests/auto/corelib/kernel/.prev_CMakeLists.txt @@ -3,26 +3,28 @@ add_subdirectory(qcoreapplication) add_subdirectory(qdeadlinetimer) add_subdirectory(qelapsedtimer) -add_subdirectory(qeventdispatcher) add_subdirectory(qmath) add_subdirectory(qmetacontainer) add_subdirectory(qmetaobject) add_subdirectory(qmetaobjectbuilder) add_subdirectory(qmetamethod) add_subdirectory(qmetaproperty) -add_subdirectory(qmetatype) add_subdirectory(qmetaenum) add_subdirectory(qpointer) add_subdirectory(qsignalblocker) add_subdirectory(qsignalmapper) add_subdirectory(qtimer) add_subdirectory(qtranslator) -add_subdirectory(qvariant) +if(NOT ANDROID) + add_subdirectory(qeventdispatcher) +endif() if(TARGET Qt::Network) add_subdirectory(qeventloop) endif() if(TARGET Qt::Gui) + add_subdirectory(qmetatype) add_subdirectory(qmimedata) + add_subdirectory(qvariant) endif() if(TARGET Qt::Network AND NOT ANDROID AND NOT UIKIT) add_subdirectory(qobject) diff --git a/tests/auto/corelib/kernel/CMakeLists.txt b/tests/auto/corelib/kernel/CMakeLists.txt index 85d80e7a3df..bb7a665c76c 100644 --- a/tests/auto/corelib/kernel/CMakeLists.txt +++ b/tests/auto/corelib/kernel/CMakeLists.txt @@ -3,7 +3,6 @@ add_subdirectory(qcoreapplication) add_subdirectory(qdeadlinetimer) add_subdirectory(qelapsedtimer) -add_subdirectory(qeventdispatcher) add_subdirectory(qmath) add_subdirectory(qmetacontainer) add_subdirectory(qmetaobject) @@ -16,6 +15,10 @@ add_subdirectory(qsignalblocker) add_subdirectory(qsignalmapper) add_subdirectory(qtimer) add_subdirectory(qtranslator) +# QTBUG-88135 # special case +if(NOT ANDROID) + add_subdirectory(qeventdispatcher) +endif() if(TARGET Qt::Network) add_subdirectory(qeventloop) endif() diff --git a/tests/auto/corelib/kernel/kernel.pro b/tests/auto/corelib/kernel/kernel.pro index 627407b0e46..ef385a7798a 100644 --- a/tests/auto/corelib/kernel/kernel.pro +++ b/tests/auto/corelib/kernel/kernel.pro @@ -27,6 +27,9 @@ SUBDIRS=\ qwineventnotifier \ qproperty +# QTBUG-88135 +android: SUBDIRS -= qeventdispatcher + !qtHaveModule(gui): SUBDIRS -= \ qmimedata \ qvariant \ diff --git a/tests/auto/corelib/plugin/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/.prev_CMakeLists.txt index 710d471e8ae..9abd791c92b 100644 --- a/tests/auto/corelib/plugin/.prev_CMakeLists.txt +++ b/tests/auto/corelib/plugin/.prev_CMakeLists.txt @@ -1,13 +1,13 @@ # Generated from plugin.pro. -if(QT_BUILD_SHARED_LIBS) +if(QT_BUILD_SHARED_LIBS AND NOT ANDROID) add_subdirectory(qfactoryloader) endif() add_subdirectory(quuid) -if(QT_FEATURE_library) +if(QT_FEATURE_library AND NOT ANDROID) add_subdirectory(qpluginloader) add_subdirectory(qlibrary) endif() -if(QT_BUILD_SHARED_LIBS AND QT_FEATURE_library) +if(QT_BUILD_SHARED_LIBS AND QT_FEATURE_library AND NOT ANDROID) add_subdirectory(qplugin) endif() diff --git a/tests/auto/corelib/plugin/CMakeLists.txt b/tests/auto/corelib/plugin/CMakeLists.txt index 13a97ed349e..e0ac398144a 100644 --- a/tests/auto/corelib/plugin/CMakeLists.txt +++ b/tests/auto/corelib/plugin/CMakeLists.txt @@ -1,14 +1,17 @@ # Generated from plugin.pro. -if(QT_BUILD_SHARED_LIBS) +# QTBUG-87438 # special case +if(QT_BUILD_SHARED_LIBS AND NOT ANDROID) add_subdirectory(qfactoryloader) endif() add_subdirectory(quuid) -if(QT_FEATURE_library) +# QTBUG-87438 # special case +if(QT_FEATURE_library AND NOT ANDROID) add_subdirectory(qpluginloader) add_subdirectory(qlibrary) endif() -if(QT_BUILD_SHARED_LIBS AND QT_FEATURE_library) +# QTBUG-87438 # special case +if(QT_BUILD_SHARED_LIBS AND QT_FEATURE_library AND NOT ANDROID) # special case begin # QTBUG-85364 if(NOT LINUX) diff --git a/tests/auto/corelib/plugin/plugin.pro b/tests/auto/corelib/plugin/plugin.pro index 240608fddfc..c153fa37d9f 100644 --- a/tests/auto/corelib/plugin/plugin.pro +++ b/tests/auto/corelib/plugin/plugin.pro @@ -13,3 +13,12 @@ contains(CONFIG, static) { SUBDIRS -= qfactoryloader \ qplugin } + +# QTBUG-87438 +android { + SUBDIRS -= \ + qpluginloader \ + qplugin \ + qlibrary \ + qfactoryloader +} diff --git a/tests/auto/corelib/serialization/qdatastream/BLACKLIST b/tests/auto/corelib/serialization/qdatastream/BLACKLIST new file mode 100644 index 00000000000..b5ee66fe841 --- /dev/null +++ b/tests/auto/corelib/serialization/qdatastream/BLACKLIST @@ -0,0 +1,3 @@ +# QTBUG-87660 +[status_QBitArray] +android diff --git a/tests/auto/corelib/serialization/qtextstream/BLACKLIST b/tests/auto/corelib/serialization/qtextstream/BLACKLIST index eb50b6f59cb..aef7d7aa26f 100644 --- a/tests/auto/corelib/serialization/qtextstream/BLACKLIST +++ b/tests/auto/corelib/serialization/qtextstream/BLACKLIST @@ -1,2 +1,9 @@ [stillOpenWhenAtEnd] windows-7sp1 +# QTBUG-87410 +[readStdin] +android +[readAllFromStdin] +android +[readLineFromStdin] +android diff --git a/tests/auto/corelib/text/CMakeLists.txt b/tests/auto/corelib/text/CMakeLists.txt index 93efdf2d710..5b53538b9ea 100644 --- a/tests/auto/corelib/text/CMakeLists.txt +++ b/tests/auto/corelib/text/CMakeLists.txt @@ -9,7 +9,6 @@ add_subdirectory(qbytedatabuffer) add_subdirectory(qchar) add_subdirectory(qcollator) add_subdirectory(qlatin1string) -add_subdirectory(qlocale) add_subdirectory(qregularexpression) add_subdirectory(qstring) add_subdirectory(qstring_no_cast_from_bytearray) @@ -22,3 +21,7 @@ add_subdirectory(qstringmatcher) add_subdirectory(qstringtokenizer) add_subdirectory(qstringview) add_subdirectory(qtextboundaryfinder) +# QTBUG-87414 # special case +if(NOT ANDROID) + add_subdirectory(qlocale) +endif() diff --git a/tests/auto/corelib/text/qstring/BLACKLIST b/tests/auto/corelib/text/qstring/BLACKLIST new file mode 100644 index 00000000000..767f54e9d00 --- /dev/null +++ b/tests/auto/corelib/text/qstring/BLACKLIST @@ -0,0 +1,3 @@ +# QTBUG-87416 +[append_special_cases] +android diff --git a/tests/auto/corelib/text/qstringconverter/BLACKLIST b/tests/auto/corelib/text/qstringconverter/BLACKLIST new file mode 100644 index 00000000000..0bf19822776 --- /dev/null +++ b/tests/auto/corelib/text/qstringconverter/BLACKLIST @@ -0,0 +1,3 @@ +# QTBUG-87418 +[convertUtf8] +android diff --git a/tests/auto/corelib/text/text.pro b/tests/auto/corelib/text/text.pro index f03f28936a1..24645c850ce 100644 --- a/tests/auto/corelib/text/text.pro +++ b/tests/auto/corelib/text/text.pro @@ -23,3 +23,7 @@ SUBDIRS = \ qstringtokenizer \ qstringview \ qtextboundaryfinder + +# QTBUG-87414 +android: SUBDIRS -= \ + qlocale diff --git a/tests/auto/corelib/thread/.prev_CMakeLists.txt b/tests/auto/corelib/thread/.prev_CMakeLists.txt index b73d9af0594..15e79394450 100644 --- a/tests/auto/corelib/thread/.prev_CMakeLists.txt +++ b/tests/auto/corelib/thread/.prev_CMakeLists.txt @@ -15,11 +15,13 @@ if(QT_FEATURE_thread) add_subdirectory(qthread) add_subdirectory(qthreadonce) add_subdirectory(qthreadpool) - add_subdirectory(qthreadstorage) add_subdirectory(qwaitcondition) add_subdirectory(qwritelocker) add_subdirectory(qpromise) endif() -if(TARGET Qt::Concurrent) +if(QT_FEATURE_thread AND NOT ANDROID) + add_subdirectory(qthreadstorage) +endif() +if(TARGET Qt::Concurrent AND NOT ANDROID) add_subdirectory(qfuturewatcher) endif() diff --git a/tests/auto/corelib/thread/CMakeLists.txt b/tests/auto/corelib/thread/CMakeLists.txt index 8c3e33d6dc3..931d8f0c6a8 100644 --- a/tests/auto/corelib/thread/CMakeLists.txt +++ b/tests/auto/corelib/thread/CMakeLists.txt @@ -20,11 +20,19 @@ if(QT_FEATURE_thread) # special case end add_subdirectory(qthreadonce) add_subdirectory(qthreadpool) - add_subdirectory(qthreadstorage) + # special case begin + # QTBUG-87431 + if(NOT ANDROID) + add_subdirectory(qthreadstorage) + endif() + # special case end add_subdirectory(qwaitcondition) add_subdirectory(qwritelocker) add_subdirectory(qpromise) endif() -if(TARGET Qt::Concurrent) +# special case begin +# QTBUG-87431 +if(TARGET Qt::Concurrent AND NOT ANDROID) add_subdirectory(qfuturewatcher) endif() +# special case end diff --git a/tests/auto/corelib/thread/qatomicint/BLACKLIST b/tests/auto/corelib/thread/qatomicint/BLACKLIST new file mode 100644 index 00000000000..406fb7cc1c6 --- /dev/null +++ b/tests/auto/corelib/thread/qatomicint/BLACKLIST @@ -0,0 +1,3 @@ +# QTBUG-87422 +[alignment] +android diff --git a/tests/auto/corelib/thread/qthreadstorage/BLACKLIST b/tests/auto/corelib/thread/qthreadstorage/BLACKLIST new file mode 100644 index 00000000000..84906ff86e8 --- /dev/null +++ b/tests/auto/corelib/thread/qthreadstorage/BLACKLIST @@ -0,0 +1,3 @@ +# QTBUG-87431 +[crashOnExit] +android diff --git a/tests/auto/corelib/thread/thread.pro b/tests/auto/corelib/thread/thread.pro index 510614ef66f..d6e24b9b33e 100644 --- a/tests/auto/corelib/thread/thread.pro +++ b/tests/auto/corelib/thread/thread.pro @@ -26,3 +26,9 @@ qtHaveModule(concurrent) { SUBDIRS += \ qfuturewatcher } + +android: SUBDIRS -= \ + # QTBUG-87431 + qthreadstorage \ + # QTBUG-88136 + qfuturewatcher diff --git a/tests/auto/corelib/time/qdate/BLACKLIST b/tests/auto/corelib/time/qdate/BLACKLIST new file mode 100644 index 00000000000..c1f1367c86a --- /dev/null +++ b/tests/auto/corelib/time/qdate/BLACKLIST @@ -0,0 +1,3 @@ +# QTBUG-87662 +[startOfDay_endOfDay:Sofia] +android diff --git a/tests/auto/corelib/time/qdatetime/BLACKLIST b/tests/auto/corelib/time/qdatetime/BLACKLIST new file mode 100644 index 00000000000..cca233512ee --- /dev/null +++ b/tests/auto/corelib/time/qdatetime/BLACKLIST @@ -0,0 +1,7 @@ +# QTBUG-87663 +[fromStringStringFormat] +android +[timeZones] +android +[systemTimeZoneChange] +android diff --git a/tests/auto/corelib/time/qtimezone/BLACKLIST b/tests/auto/corelib/time/qtimezone/BLACKLIST index b820bab3d9f..ddc9a107c06 100644 --- a/tests/auto/corelib/time/qtimezone/BLACKLIST +++ b/tests/auto/corelib/time/qtimezone/BLACKLIST @@ -173,3 +173,14 @@ android android [transitionEachZone:America/Danmarkshavn@1970] android +# QTBUG-87435 +[createTest] +android +[systemZone] +android +[utcOffsetId] +android +[stressTest] +android +[serialize] +android diff --git a/tests/auto/corelib/tools/.prev_CMakeLists.txt b/tests/auto/corelib/tools/.prev_CMakeLists.txt index 02dec30c5d2..6bd31465bd5 100644 --- a/tests/auto/corelib/tools/.prev_CMakeLists.txt +++ b/tests/auto/corelib/tools/.prev_CMakeLists.txt @@ -37,9 +37,11 @@ add_subdirectory(qsharedpointer) add_subdirectory(qsize) add_subdirectory(qsizef) add_subdirectory(qstl) -add_subdirectory(qtimeline) add_subdirectory(qvarlengtharray) add_subdirectory(qversionnumber) +if(NOT ANDROID) + add_subdirectory(qtimeline) +endif() if(APPLE) add_subdirectory(qmacautoreleasepool) endif() diff --git a/tests/auto/corelib/tools/CMakeLists.txt b/tests/auto/corelib/tools/CMakeLists.txt index be0c4932c6c..bf6a97bc07b 100644 --- a/tests/auto/corelib/tools/CMakeLists.txt +++ b/tests/auto/corelib/tools/CMakeLists.txt @@ -37,9 +37,12 @@ add_subdirectory(qset) add_subdirectory(qsize) add_subdirectory(qsizef) add_subdirectory(qstl) -add_subdirectory(qtimeline) add_subdirectory(qvarlengtharray) add_subdirectory(qversionnumber) +# QTBUG-88137 # special case +if(NOT ANDROID) + add_subdirectory(qtimeline) +endif() if(APPLE) add_subdirectory(qmacautoreleasepool) endif() diff --git a/tests/auto/corelib/tools/tools.pro b/tests/auto/corelib/tools/tools.pro index 0557b69e5c8..c0519a5c5e3 100644 --- a/tests/auto/corelib/tools/tools.pro +++ b/tests/auto/corelib/tools/tools.pro @@ -42,3 +42,6 @@ SUBDIRS=\ qversionnumber darwin: SUBDIRS += qmacautoreleasepool + +# QTBUG-88137 +android: SUBDIRS -= qtimeline diff --git a/tests/auto/gui/image/CMakeLists.txt b/tests/auto/gui/image/CMakeLists.txt index 8ae016a8f8e..14930536c93 100644 --- a/tests/auto/gui/image/CMakeLists.txt +++ b/tests/auto/gui/image/CMakeLists.txt @@ -1,6 +1,7 @@ # Generated from image.pro. -if(TARGET Qt::Network) +# QTBUG-87669 # special case +if(TARGET Qt::Network AND NOT ANDROID) add_subdirectory(qimagereader) endif() add_subdirectory(qicoimageformat) @@ -10,8 +11,11 @@ add_subdirectory(qimageiohandler) add_subdirectory(qimagewriter) add_subdirectory(qmovie) add_subdirectory(qpicture) -add_subdirectory(qicon) add_subdirectory(qiconhighdpi) if(QT_FEATURE_private_tests) add_subdirectory(qpixmapcache) endif() +# QTBUG-87669 # special case +if(NOT ANDROID) + add_subdirectory(qicon) +endif() diff --git a/tests/auto/gui/image/image.pro b/tests/auto/gui/image/image.pro index f4e2ab20ba5..9686dc08b8a 100644 --- a/tests/auto/gui/image/image.pro +++ b/tests/auto/gui/image/image.pro @@ -18,3 +18,7 @@ SUBDIRS=\ !qtConfig(private_tests): SUBDIRS -= \ qpixmapcache \ +# QTBUG-87669 +android: SUBDIRS -= \ + qimagereader \ + qicon diff --git a/tests/auto/gui/itemmodels/qfilesystemmodel/BLACKLIST b/tests/auto/gui/itemmodels/qfilesystemmodel/BLACKLIST index 4119afce84d..ae8a64dc1f1 100644 --- a/tests/auto/gui/itemmodels/qfilesystemmodel/BLACKLIST +++ b/tests/auto/gui/itemmodels/qfilesystemmodel/BLACKLIST @@ -3,3 +3,6 @@ ubuntu b2qt [specialFiles] b2qt +# QTBUG-87427 +[specialFiles] +android diff --git a/tests/auto/gui/kernel/qscreen/BLACKLIST b/tests/auto/gui/kernel/qscreen/BLACKLIST new file mode 100644 index 00000000000..0395ea7b1de --- /dev/null +++ b/tests/auto/gui/kernel/qscreen/BLACKLIST @@ -0,0 +1,3 @@ +# QTBUG-87390 +[grabWindow] +android diff --git a/tests/auto/gui/kernel/qtouchevent/BLACKLIST b/tests/auto/gui/kernel/qtouchevent/BLACKLIST index dcda77bce79..2876c120fc1 100644 --- a/tests/auto/gui/kernel/qtouchevent/BLACKLIST +++ b/tests/auto/gui/kernel/qtouchevent/BLACKLIST @@ -1,2 +1,8 @@ [multiPointRawEventTranslationOnTouchScreen] ubuntu-16.04 +[multiPointRawEventTranslationOnTouchScreen] +android +[multiPointRawEventTranslationOnTouchPad] +android +[touchBeginWithGraphicsWidget] +android diff --git a/tests/auto/gui/kernel/qwindow/BLACKLIST b/tests/auto/gui/kernel/qwindow/BLACKLIST index 4c7b15ac745..56f99f412ae 100644 --- a/tests/auto/gui/kernel/qwindow/BLACKLIST +++ b/tests/auto/gui/kernel/qwindow/BLACKLIST @@ -28,3 +28,16 @@ android [childWindowPositioning:show] # QTBUG-69156 android +# QTBUG-87392 +[paintEvent] +android +[isActive] +android +[modalWithChildWindow] +android +[modalWindowModallity] +android +[modalWindowEnterEventOnHide_QTBUG35109] +android +[spuriousMouseMove] +android diff --git a/tests/auto/gui/painting/CMakeLists.txt b/tests/auto/gui/painting/CMakeLists.txt index 8152832d9a2..682fc487c21 100644 --- a/tests/auto/gui/painting/CMakeLists.txt +++ b/tests/auto/gui/painting/CMakeLists.txt @@ -3,7 +3,6 @@ add_subdirectory(qpainterpath) add_subdirectory(qpainterpathstroker) add_subdirectory(qcolor) -add_subdirectory(qcolorspace) add_subdirectory(qbrush) add_subdirectory(qregion) add_subdirectory(qpagelayout) @@ -15,6 +14,10 @@ add_subdirectory(qpaintengine) add_subdirectory(qrangecollection) add_subdirectory(qtransform) add_subdirectory(qpolygon) +# QTBUG-87669 # special case +if(NOT ANDROID) + add_subdirectory(qcolorspace) +endif() if(QT_FEATURE_private_tests) add_subdirectory(qpathclipper) endif() diff --git a/tests/auto/gui/painting/painting.pro b/tests/auto/gui/painting/painting.pro index 4bc172e2409..f99fc6c4e85 100644 --- a/tests/auto/gui/painting/painting.pro +++ b/tests/auto/gui/painting/painting.pro @@ -20,4 +20,6 @@ SUBDIRS=\ !qtConfig(private_tests): SUBDIRS -= \ qpathclipper \ - +# QTBUG-87669 +android: SUBDIRS -= \ + qcolorspace diff --git a/tests/auto/gui/qopengl/BLACKLIST b/tests/auto/gui/qopengl/BLACKLIST index 10e0520bd95..cb40fa3430c 100644 --- a/tests/auto/gui/qopengl/BLACKLIST +++ b/tests/auto/gui/qopengl/BLACKLIST @@ -1,2 +1,5 @@ [wglContextWrap] windows +# QTBUG-87665 +[fboMRT] +android diff --git a/tests/auto/gui/rhi/qrhi/BLACKLIST b/tests/auto/gui/rhi/qrhi/BLACKLIST new file mode 100644 index 00000000000..828af6f2e7d --- /dev/null +++ b/tests/auto/gui/rhi/qrhi/BLACKLIST @@ -0,0 +1,3 @@ +# QTBUG-87429 +[renderToTextureArrayOfTexturedQuad] +android diff --git a/tests/auto/gui/text/qfontdatabase/BLACKLIST b/tests/auto/gui/text/qfontdatabase/BLACKLIST index 0870ca11d74..95494d6111d 100644 --- a/tests/auto/gui/text/qfontdatabase/BLACKLIST +++ b/tests/auto/gui/text/qfontdatabase/BLACKLIST @@ -1,2 +1,5 @@ [systemFixedFont] # QTBUG-54623 b2qt +# QTBUG-87405 +[systemFixedFont] +android diff --git a/tests/auto/network/kernel/qnetworkproxyfactory/BLACKLIST b/tests/auto/network/kernel/qnetworkproxyfactory/BLACKLIST new file mode 100644 index 00000000000..6e9d9ffdec9 --- /dev/null +++ b/tests/auto/network/kernel/qnetworkproxyfactory/BLACKLIST @@ -0,0 +1,3 @@ +# QTBUG-87385 +[genericSystemProxy] +android diff --git a/tests/auto/network/socket/.prev_CMakeLists.txt b/tests/auto/network/socket/.prev_CMakeLists.txt index 7e72b4be293..7e822d23ab3 100644 --- a/tests/auto/network/socket/.prev_CMakeLists.txt +++ b/tests/auto/network/socket/.prev_CMakeLists.txt @@ -7,9 +7,11 @@ if(QT_FEATURE_private_tests) add_subdirectory(platformsocketengine) endif() add_subdirectory(qudpsocket) -add_subdirectory(qlocalsocket) -add_subdirectory(qtcpserver) add_subdirectory(qabstractsocket) +if(NOT ANDROID) + add_subdirectory(qlocalsocket) + add_subdirectory(qtcpserver) +endif() if(QT_FEATURE_sctp) add_subdirectory(qsctpsocket) endif() diff --git a/tests/auto/network/socket/CMakeLists.txt b/tests/auto/network/socket/CMakeLists.txt index 7e72b4be293..6e4421aad87 100644 --- a/tests/auto/network/socket/CMakeLists.txt +++ b/tests/auto/network/socket/CMakeLists.txt @@ -7,9 +7,13 @@ if(QT_FEATURE_private_tests) add_subdirectory(platformsocketengine) endif() add_subdirectory(qudpsocket) -add_subdirectory(qlocalsocket) -add_subdirectory(qtcpserver) add_subdirectory(qabstractsocket) +if(NOT ANDROID) + # QTBUG-87387 # special case + add_subdirectory(qlocalsocket) + # QTBUG-87388 # special case + add_subdirectory(qtcpserver) +endif() if(QT_FEATURE_sctp) add_subdirectory(qsctpsocket) endif() diff --git a/tests/auto/network/socket/qlocalsocket/BLACKLIST b/tests/auto/network/socket/qlocalsocket/BLACKLIST new file mode 100644 index 00000000000..cec50425c59 --- /dev/null +++ b/tests/auto/network/socket/qlocalsocket/BLACKLIST @@ -0,0 +1,7 @@ +# QTBUG-87387 +[fullPath] +android +[processConnection] +android +[verifySocketOptions] +android diff --git a/tests/auto/network/socket/socket.pro b/tests/auto/network/socket/socket.pro index 1248d711720..e71c6884cd7 100644 --- a/tests/auto/network/socket/socket.pro +++ b/tests/auto/network/socket/socket.pro @@ -12,6 +12,12 @@ SUBDIRS=\ platformsocketengine \ qsctpsocket \ +android: SUBDIRS -= \ + # QTBUG-87387 + qlocalsocket \ + # QTBUG-87388 + qtcpserver + !qtConfig(private_tests): SUBDIRS -= \ platformsocketengine \ qtcpsocket \ diff --git a/tests/auto/network/ssl/qsslkey/BLACKLIST b/tests/auto/network/ssl/qsslkey/BLACKLIST index 19fb15cd1fc..b9d7b695283 100644 --- a/tests/auto/network/ssl/qsslkey/BLACKLIST +++ b/tests/auto/network/ssl/qsslkey/BLACKLIST @@ -7,3 +7,8 @@ rhel [toPemOrDer] rhel +# QTBUG-87386 +[passphraseChecks] +android +[noPassphraseChecks] +android diff --git a/tests/auto/other/.prev_CMakeLists.txt b/tests/auto/other/.prev_CMakeLists.txt index 448e831e76b..3ba56f16fbb 100644 --- a/tests/auto/other/.prev_CMakeLists.txt +++ b/tests/auto/other/.prev_CMakeLists.txt @@ -1,9 +1,5 @@ # Generated from other.pro. -if(NOT CMAKE_CROSSCOMPILING) - add_subdirectory(compiler) - add_subdirectory(atwrapper) -endif() if(TARGET Qt::Widgets) add_subdirectory(gestures) add_subdirectory(languagechange) @@ -23,7 +19,7 @@ endif() if(TARGET Qt::Network) add_subdirectory(networkselftest) endif() -if(QT_FEATURE_accessibility AND TARGET Qt::Gui AND TARGET Qt::Widgets) +if(QT_FEATURE_accessibility AND TARGET Qt::Gui AND TARGET Qt::Widgets AND NOT ANDROID) add_subdirectory(qaccessibility) endif() if(TARGET Qt::Gui) @@ -31,12 +27,15 @@ if(TARGET Qt::Gui) endif() add_subdirectory(qobjectrace) add_subdirectory(toolsupport) -if(QT_FEATURE_process AND TARGET Qt::Gui) +if(QT_FEATURE_process AND TARGET Qt::Gui AND NOT ANDROID) add_subdirectory(qprocess_and_guieventloop) endif() if(QT_FEATURE_accessibility_atspi_bridge AND TARGET Qt::Gui AND TARGET Qt::Widgets) add_subdirectory(qaccessibilitylinux) endif() +if(NOT CMAKE_CROSSCOMPILING) + add_subdirectory(atwrapper) +endif() if(MACOS AND TARGET Qt::Gui) add_subdirectory(macnativeevents) endif() diff --git a/tests/auto/other/CMakeLists.txt b/tests/auto/other/CMakeLists.txt index 093a54aff8c..6142d086b47 100644 --- a/tests/auto/other/CMakeLists.txt +++ b/tests/auto/other/CMakeLists.txt @@ -22,7 +22,8 @@ endif() if(TARGET Qt::Network) add_subdirectory(networkselftest) endif() -if(QT_FEATURE_accessibility AND TARGET Qt::Gui AND TARGET Qt::Widgets) +# QTBUG-87674 # special case +if(QT_FEATURE_accessibility AND TARGET Qt::Gui AND TARGET Qt::Widgets AND NOT ANDROID) add_subdirectory(qaccessibility) endif() if(TARGET Qt::Gui) @@ -30,7 +31,8 @@ if(TARGET Qt::Gui) endif() add_subdirectory(qobjectrace) add_subdirectory(toolsupport) -if(QT_FEATURE_process AND TARGET Qt::Gui) +# QTBUG-87670 # special case +if(QT_FEATURE_process AND TARGET Qt::Gui AND NOT ANDROID) add_subdirectory(qprocess_and_guieventloop) endif() if(QT_FEATURE_accessibility_atspi_bridge AND TARGET Qt::Gui AND TARGET Qt::Widgets) diff --git a/tests/auto/other/other.pro b/tests/auto/other/other.pro index 662ae228685..7b507836832 100644 --- a/tests/auto/other/other.pro +++ b/tests/auto/other/other.pro @@ -66,3 +66,9 @@ android: SUBDIRS += \ android qtHaveModule(gui):qtConfig(xkbcommon): SUBDIRS += xkbkeyboard + +android: SUBDIRS -= \ + # QTBUG-87670 + qprocess_and_guieventloop \ + # QTBUG-87674 + qaccessibility diff --git a/tests/auto/other/qfocusevent/BLACKLIST b/tests/auto/other/qfocusevent/BLACKLIST new file mode 100644 index 00000000000..f39205d5be6 --- /dev/null +++ b/tests/auto/other/qfocusevent/BLACKLIST @@ -0,0 +1,3 @@ +# QTBUG-87395 +[checkReason_Popup] +android diff --git a/tests/auto/other/toolsupport/BLACKLIST b/tests/auto/other/toolsupport/BLACKLIST new file mode 100644 index 00000000000..6a4d5aece56 --- /dev/null +++ b/tests/auto/other/toolsupport/BLACKLIST @@ -0,0 +1,3 @@ +# QTBUG-87396 +[offsets] +android diff --git a/tests/auto/widgets/dialogs/qdialog/BLACKLIST b/tests/auto/widgets/dialogs/qdialog/BLACKLIST index ad86386895e..02eb64cb8ba 100644 --- a/tests/auto/widgets/dialogs/qdialog/BLACKLIST +++ b/tests/auto/widgets/dialogs/qdialog/BLACKLIST @@ -2,3 +2,6 @@ macos [showFullScreen] macos ci +# QTBUG-87389 +[snapToDefaultButton] +android diff --git a/tests/auto/widgets/dialogs/qfiledialog2/BLACKLIST b/tests/auto/widgets/dialogs/qfiledialog2/BLACKLIST index 9e14db48d02..fd008abe96f 100644 --- a/tests/auto/widgets/dialogs/qfiledialog2/BLACKLIST +++ b/tests/auto/widgets/dialogs/qfiledialog2/BLACKLIST @@ -1,2 +1,7 @@ [QTBUG4419_lineEditSelectAll] macos +# QTBUG-87393 +[task227930_correctNavigationKeyboardBehavior] +android +[QTBUG4419_lineEditSelectAll] +android diff --git a/tests/auto/widgets/dialogs/qwizard/BLACKLIST b/tests/auto/widgets/dialogs/qwizard/BLACKLIST new file mode 100644 index 00000000000..41b49ec112c --- /dev/null +++ b/tests/auto/widgets/dialogs/qwizard/BLACKLIST @@ -0,0 +1,3 @@ +# QTBUG-87394 +[setOption_IgnoreSubTitles] +android diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/BLACKLIST b/tests/auto/widgets/graphicsview/qgraphicsview/BLACKLIST index f59544f3366..fe3d929e9ef 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsview/BLACKLIST +++ b/tests/auto/widgets/graphicsview/qgraphicsview/BLACKLIST @@ -18,3 +18,30 @@ opensuse-42.3 ubuntu-16.04 [fitInView] osx +# QTBUG-87397 +[itemsAtPoint] +android +[itemsInRect_cosmeticAdjust] +android +[itemAt] +android +[mapToScenePath] +android +[mapFromScenePoly] +android +[mapFromScenePath] +android +[viewportUpdateMode] +android +[scrollBarRanges] +android +[moveItemWhileScrolling] +android +[exposeRegion] +android +[update2] +android +[update_ancestorClipsChildrenToShape] +android +[update_ancestorClipsChildrenToShape2] +android diff --git a/tests/auto/widgets/itemviews/qabstractitemview/BLACKLIST b/tests/auto/widgets/itemviews/qabstractitemview/BLACKLIST index 1233bec1665..249c91c3c47 100644 --- a/tests/auto/widgets/itemviews/qabstractitemview/BLACKLIST +++ b/tests/auto/widgets/itemviews/qabstractitemview/BLACKLIST @@ -1,2 +1,5 @@ [task200665_itemEntered] macos # Can't move cursor (QTBUG-76312) +# QTBUG-87400 +[task200665_itemEntered] +android diff --git a/tests/auto/widgets/itemviews/qheaderview/BLACKLIST b/tests/auto/widgets/itemviews/qheaderview/BLACKLIST index 4eceaae0d31..b8a4435fe19 100644 --- a/tests/auto/widgets/itemviews/qheaderview/BLACKLIST +++ b/tests/auto/widgets/itemviews/qheaderview/BLACKLIST @@ -1,2 +1,5 @@ [stretchAndRestoreLastSection] opensuse-leap +# QTBUG-87406 +[stretchAndRestoreLastSection] +android diff --git a/tests/auto/widgets/itemviews/qtableview/BLACKLIST b/tests/auto/widgets/itemviews/qtableview/BLACKLIST index ff870915be2..c8fc59bc46e 100644 --- a/tests/auto/widgets/itemviews/qtableview/BLACKLIST +++ b/tests/auto/widgets/itemviews/qtableview/BLACKLIST @@ -3,3 +3,10 @@ osx [mouseWheel:scroll down per pixel] macos +# QTBUG-87407 +[rowViewportPosition] +android +[columnViewportPosition] +android +[task191545_dragSelectRows] +android diff --git a/tests/auto/widgets/itemviews/qtreeview/BLACKLIST b/tests/auto/widgets/itemviews/qtreeview/BLACKLIST new file mode 100644 index 00000000000..3aaf1e4e64a --- /dev/null +++ b/tests/auto/widgets/itemviews/qtreeview/BLACKLIST @@ -0,0 +1,5 @@ +# QTBUG-87408 +[horizontalScrollMode] +android +[setSelection] +android diff --git a/tests/auto/widgets/kernel/CMakeLists.txt b/tests/auto/widgets/kernel/CMakeLists.txt index 0c48aec1496..c94c48aaa43 100644 --- a/tests/auto/widgets/kernel/CMakeLists.txt +++ b/tests/auto/widgets/kernel/CMakeLists.txt @@ -7,7 +7,6 @@ add_subdirectory(qgridlayout) add_subdirectory(qlayout) add_subdirectory(qstackedlayout) add_subdirectory(qtooltip) -add_subdirectory(qwidget) add_subdirectory(qwidget_window) add_subdirectory(qwidgetmetatype) add_subdirectory(qwidgetsvariant) @@ -16,6 +15,10 @@ add_subdirectory(qsizepolicy) if(NOT APPLE) add_subdirectory(qgesturerecognizer) endif() +# QTBUG-87668 # special case +if(NOT ANDROID) + add_subdirectory(qwidget) +endif() if(QT_FEATURE_shortcut) add_subdirectory(qshortcut) endif() diff --git a/tests/auto/widgets/kernel/kernel.pro b/tests/auto/widgets/kernel/kernel.pro index 8fbaf948f2f..6fba6363544 100644 --- a/tests/auto/widgets/kernel/kernel.pro +++ b/tests/auto/widgets/kernel/kernel.pro @@ -16,6 +16,10 @@ SUBDIRS=\ qshortcut \ qsizepolicy +# QTBUG-87668 +android: SUBDIRS -= \ + qwidget + darwin:SUBDIRS -= \ qgesturerecognizer \ diff --git a/tests/auto/widgets/kernel/qapplication/BLACKLIST b/tests/auto/widgets/kernel/qapplication/BLACKLIST index cce10602e45..aa3438975c0 100644 --- a/tests/auto/widgets/kernel/qapplication/BLACKLIST +++ b/tests/auto/widgets/kernel/qapplication/BLACKLIST @@ -3,3 +3,20 @@ ubuntu-20.04 [touchEventPropagation] # QTBUG-66745 opensuse-leap +# QTBUG-87666 +[setFont] +android +[closeAllWindows] +android +[libraryPaths_qt_plugin_path_2] +android +[desktopSettingsAware] +android +[applicationPalettePolish] +android +[touchEventPropagation] +android +[wheelEventPropagation] +android +[qtbug_12673] +android diff --git a/tests/auto/widgets/kernel/qformlayout/BLACKLIST b/tests/auto/widgets/kernel/qformlayout/BLACKLIST new file mode 100644 index 00000000000..375682e7887 --- /dev/null +++ b/tests/auto/widgets/kernel/qformlayout/BLACKLIST @@ -0,0 +1,3 @@ +# QTBUG-87401 +[wrapping] +android diff --git a/tests/auto/widgets/kernel/qgesturerecognizer/BLACKLIST b/tests/auto/widgets/kernel/qgesturerecognizer/BLACKLIST new file mode 100644 index 00000000000..16fc53e75b3 --- /dev/null +++ b/tests/auto/widgets/kernel/qgesturerecognizer/BLACKLIST @@ -0,0 +1,3 @@ +# QTBUG-87403 +[swipeGesture] +android diff --git a/tests/auto/widgets/kernel/qgridlayout/BLACKLIST b/tests/auto/widgets/kernel/qgridlayout/BLACKLIST new file mode 100644 index 00000000000..d3dedae7533 --- /dev/null +++ b/tests/auto/widgets/kernel/qgridlayout/BLACKLIST @@ -0,0 +1,3 @@ +# QTBUG-87404 +[minMaxSize] +android diff --git a/tests/auto/widgets/kernel/qwidget/BLACKLIST b/tests/auto/widgets/kernel/qwidget/BLACKLIST index 9df4e4c1ab2..87963f0ed12 100644 --- a/tests/auto/widgets/kernel/qwidget/BLACKLIST +++ b/tests/auto/widgets/kernel/qwidget/BLACKLIST @@ -44,3 +44,33 @@ ubuntu macos # Can't move cursor (QTBUG-76312) [taskQTBUG_4055_sendSyntheticEnterLeave] macos # Can't move cursor (QTBUG-76312) + +# QTBUG-87668 +[reparent] +android +[windowState] +android +[showMinimizedKeepsFocus] +android +[normalGeometry] +android +[saveRestoreGeometry] +android +[optimizedResizeMove] +android +[resizeEvent] +android +[update] +android +[scroll] +android +[setWindowGeometry] +android +[windowMoveResize] +android +[moveChild] +android +[showAndMoveChild] +android +[multipleToplevelFocusCheck] +android diff --git a/tests/auto/widgets/kernel/qwidget_window/BLACKLIST b/tests/auto/widgets/kernel/qwidget_window/BLACKLIST index d3bfaba4330..7eae8254ac5 100644 --- a/tests/auto/widgets/kernel/qwidget_window/BLACKLIST +++ b/tests/auto/widgets/kernel/qwidget_window/BLACKLIST @@ -2,3 +2,18 @@ # QTBUG-66345 opensuse-42.3 ubuntu-16.04 +# QTBUG-87412 +[tst_move_show] +android +[tst_show_move_hide_show] +android +[tst_resize_show] +android +[tst_show_resize_hide_show] +android +[tst_resize_count] +android +[setWindowState] +android +[mouseMoveWithPopup] +android diff --git a/tests/auto/widgets/kernel/qwindowcontainer/BLACKLIST b/tests/auto/widgets/kernel/qwindowcontainer/BLACKLIST new file mode 100644 index 00000000000..b788b0cea56 --- /dev/null +++ b/tests/auto/widgets/kernel/qwindowcontainer/BLACKLIST @@ -0,0 +1,5 @@ +# QTBUG-87413 +[testActivation] +android +[testAncestorChange] +android diff --git a/tests/auto/widgets/util/qscroller/BLACKLIST b/tests/auto/widgets/util/qscroller/BLACKLIST index 347ab6440bb..3a91f24d51e 100644 --- a/tests/auto/widgets/util/qscroller/BLACKLIST +++ b/tests/auto/widgets/util/qscroller/BLACKLIST @@ -3,3 +3,6 @@ macos [scroll] macos +# QTBUG-87409 +[scrollTo] +android diff --git a/tests/auto/widgets/widgets/CMakeLists.txt b/tests/auto/widgets/widgets/CMakeLists.txt index 5421fdf3782..e0c71f5c201 100644 --- a/tests/auto/widgets/widgets/CMakeLists.txt +++ b/tests/auto/widgets/widgets/CMakeLists.txt @@ -18,11 +18,8 @@ add_subdirectory(qframe) add_subdirectory(qgroupbox) add_subdirectory(qlabel) add_subdirectory(qlcdnumber) -add_subdirectory(qlineedit) -add_subdirectory(qmdiarea) add_subdirectory(qmdisubwindow) add_subdirectory(qmenu) -add_subdirectory(qmenubar) add_subdirectory(qplaintextedit) add_subdirectory(qprogressbar) add_subdirectory(qpushbutton) @@ -50,6 +47,14 @@ endif() if(QT_FEATURE_shortcut) add_subdirectory(qkeysequenceedit) endif() +if(NOT ANDROID) + # QTBUG-87417 # special case + add_subdirectory(qlineedit) + # QTBUG-87420 # special case + add_subdirectory(qmdiarea) + # QTBUG-87421 # special case + add_subdirectory(qmenubar) +endif() if(QT_FEATURE_opengl) add_subdirectory(qopenglwidget) endif() diff --git a/tests/auto/widgets/widgets/qabstractbutton/BLACKLIST b/tests/auto/widgets/widgets/qabstractbutton/BLACKLIST new file mode 100644 index 00000000000..f12e5805593 --- /dev/null +++ b/tests/auto/widgets/widgets/qabstractbutton/BLACKLIST @@ -0,0 +1,5 @@ +# QTBUG-87411 +[shortcutEvents] +android +[stopRepeatTimer] +android diff --git a/tests/auto/widgets/widgets/qdockwidget/BLACKLIST b/tests/auto/widgets/widgets/qdockwidget/BLACKLIST new file mode 100644 index 00000000000..6a3b1899396 --- /dev/null +++ b/tests/auto/widgets/widgets/qdockwidget/BLACKLIST @@ -0,0 +1,3 @@ +# QTBUG-87415 +[task169808_setFloating] +android diff --git a/tests/auto/widgets/widgets/qlineedit/BLACKLIST b/tests/auto/widgets/widgets/qlineedit/BLACKLIST new file mode 100644 index 00000000000..9f87a6d921a --- /dev/null +++ b/tests/auto/widgets/widgets/qlineedit/BLACKLIST @@ -0,0 +1,15 @@ +# QTBUG-87417 +[undo_keypressevents] +android +[leftKeyOnSelectedText] +android +[cutWithoutSelection] +android +[inlineCompletion] +android +[textMargin] +android +[task210502_caseInsensitiveInlineCompletion] +android +[testQuickSelectionWithMouse] +android diff --git a/tests/auto/widgets/widgets/qmdiarea/BLACKLIST b/tests/auto/widgets/widgets/qmdiarea/BLACKLIST index afcb20ab8e2..7dc1834912e 100644 --- a/tests/auto/widgets/widgets/qmdiarea/BLACKLIST +++ b/tests/auto/widgets/widgets/qmdiarea/BLACKLIST @@ -13,3 +13,14 @@ opensuse-42.3 [resizeTimer] macos +# QTBUG-87420 +[subWindowActivated] +android +[subWindowActivated2] +android +[addAndRemoveWindows] +android +[activateNextAndPreviousWindow] +android +[subWindowList] +android diff --git a/tests/auto/widgets/widgets/qmdisubwindow/BLACKLIST b/tests/auto/widgets/widgets/qmdisubwindow/BLACKLIST new file mode 100644 index 00000000000..a9f224ab68c --- /dev/null +++ b/tests/auto/widgets/widgets/qmdisubwindow/BLACKLIST @@ -0,0 +1,19 @@ +# QTBUG-87419 +[emittingOfSignals] +android +[showShaded] +android +[showNormal] +android +[setOpaqueResizeAndMove] +android +[mouseDoubleClick] +android +[restoreFocusOverCreation] +android +[resizeEvents] +android +[closeOnDoubleClick] +android +[testFullScreenState] +android diff --git a/tests/auto/widgets/widgets/qmenu/BLACKLIST b/tests/auto/widgets/widgets/qmenu/BLACKLIST index d4ebf69e820..1cde4343d56 100644 --- a/tests/auto/widgets/widgets/qmenu/BLACKLIST +++ b/tests/auto/widgets/widgets/qmenu/BLACKLIST @@ -9,3 +9,20 @@ macos macos [submenuTearOffDontClose] macos # Can't move cursor (QTBUG-76312) +# QTBUG-87424 +[focus] +android +[activeSubMenuPosition] +android +[activeSubMenuPositionExec] +android +[task250673_activeMultiColumnSubMenuPosition] +android +[pushButtonPopulateOnAboutToShow] +android +[QTBUG8122_widgetActionCrashOnClose] +android +[click_while_dismissing_submenu] +android +[menuSize_Scrolling] +android diff --git a/tests/auto/widgets/widgets/qmenubar/BLACKLIST b/tests/auto/widgets/widgets/qmenubar/BLACKLIST index d412fe6e817..633bda332f0 100644 --- a/tests/auto/widgets/widgets/qmenubar/BLACKLIST +++ b/tests/auto/widgets/widgets/qmenubar/BLACKLIST @@ -5,3 +5,6 @@ ubuntu-18.04 ubuntu-20.04 [activatedCount] opensuse-42.3 +# QTBUG-87421 +[cornerWidgets] +android diff --git a/tests/auto/widgets/widgets/qopenglwidget/BLACKLIST b/tests/auto/widgets/widgets/qopenglwidget/BLACKLIST index b281eca3bfe..ecb962d8ca4 100644 --- a/tests/auto/widgets/widgets/qopenglwidget/BLACKLIST +++ b/tests/auto/widgets/widgets/qopenglwidget/BLACKLIST @@ -1,3 +1,8 @@ [stackWidgetOpaqueChildIsVisible] windows-10 msvc-2017 +# QTBUG-87436 +[clearAndGrab] +android +[stackWidgetOpaqueChildIsVisible] +android diff --git a/tests/auto/widgets/widgets/qplaintextedit/BLACKLIST b/tests/auto/widgets/widgets/qplaintextedit/BLACKLIST new file mode 100644 index 00000000000..36b9c9adee3 --- /dev/null +++ b/tests/auto/widgets/widgets/qplaintextedit/BLACKLIST @@ -0,0 +1,5 @@ +# QTBUG-87423 +[copyAvailable] +android +[adjustScrollbars] +android diff --git a/tests/auto/widgets/widgets/qprogressbar/BLACKLIST b/tests/auto/widgets/widgets/qprogressbar/BLACKLIST new file mode 100644 index 00000000000..fa25ef97a5e --- /dev/null +++ b/tests/auto/widgets/widgets/qprogressbar/BLACKLIST @@ -0,0 +1,3 @@ +# QTBUG-87425 +[setMinMaxRepaint] +android diff --git a/tests/auto/widgets/widgets/qpushbutton/BLACKLIST b/tests/auto/widgets/widgets/qpushbutton/BLACKLIST new file mode 100644 index 00000000000..9fddf5abdab --- /dev/null +++ b/tests/auto/widgets/widgets/qpushbutton/BLACKLIST @@ -0,0 +1,3 @@ +# QTBUG-87426 +[taskQTBUG_20191_shortcutWithKeypadModifer] +android diff --git a/tests/auto/widgets/widgets/qscrollbar/BLACKLIST b/tests/auto/widgets/widgets/qscrollbar/BLACKLIST new file mode 100644 index 00000000000..a98755be079 --- /dev/null +++ b/tests/auto/widgets/widgets/qscrollbar/BLACKLIST @@ -0,0 +1,3 @@ +# QTBUG-87428 +[task_209492] +android diff --git a/tests/auto/widgets/widgets/qsizegrip/BLACKLIST b/tests/auto/widgets/widgets/qsizegrip/BLACKLIST new file mode 100644 index 00000000000..c6500da304f --- /dev/null +++ b/tests/auto/widgets/widgets/qsizegrip/BLACKLIST @@ -0,0 +1,5 @@ +# QTBUG-87430 +[hideAndShowOnWindowStateChange] +android +[orientation] +android diff --git a/tests/auto/widgets/widgets/qsplitter/BLACKLIST b/tests/auto/widgets/widgets/qsplitter/BLACKLIST new file mode 100644 index 00000000000..250ade4581d --- /dev/null +++ b/tests/auto/widgets/widgets/qsplitter/BLACKLIST @@ -0,0 +1,5 @@ +# QTBUG-87432 +[replaceWidget] +android +[replaceWidgetWithSplitterChild] +android diff --git a/tests/auto/widgets/widgets/qstatusbar/BLACKLIST b/tests/auto/widgets/widgets/qstatusbar/BLACKLIST new file mode 100644 index 00000000000..8da65c26bb1 --- /dev/null +++ b/tests/auto/widgets/widgets/qstatusbar/BLACKLIST @@ -0,0 +1,3 @@ +# QTBUG-87433 +[setSizeGripEnabled] +android diff --git a/tests/auto/widgets/widgets/qtextbrowser/BLACKLIST b/tests/auto/widgets/widgets/qtextbrowser/BLACKLIST new file mode 100644 index 00000000000..18bc420ed6d --- /dev/null +++ b/tests/auto/widgets/widgets/qtextbrowser/BLACKLIST @@ -0,0 +1,5 @@ +# QTBUG-87434 +[forwardButton] +android +[sourceInsideLoadResource] +android diff --git a/tests/auto/widgets/widgets/widgets.pro b/tests/auto/widgets/widgets/widgets.pro index f67fe86606c..3474d7174ee 100644 --- a/tests/auto/widgets/widgets/widgets.pro +++ b/tests/auto/widgets/widgets/widgets.pro @@ -47,6 +47,14 @@ SUBDIRS=\ qtoolbox \ qtoolbutton \ +android: SUBDIRS -= \ + # QTBUG-87417 + qlineedit \ + # QTBUG-87420 + qmdiarea \ + # QTBUG-87421 + qmenubar + !qtConfig(shortcut): SUBDIRS -= \ qkeysequenceedit diff --git a/tests/auto/xml/CMakeLists.txt b/tests/auto/xml/CMakeLists.txt index fe747649a70..f3365a03ecf 100644 --- a/tests/auto/xml/CMakeLists.txt +++ b/tests/auto/xml/CMakeLists.txt @@ -1,3 +1,6 @@ # Generated from xml.pro. -add_subdirectory(dom) +# QTBUG-87671 # special case +if(NOT ANDROID) + add_subdirectory(dom) +endif() diff --git a/tests/auto/xml/xml.pro b/tests/auto/xml/xml.pro index f111d4a0c8a..708cdae0168 100644 --- a/tests/auto/xml/xml.pro +++ b/tests/auto/xml/xml.pro @@ -2,3 +2,6 @@ TEMPLATE=subdirs SUBDIRS=\ dom \ +# QTBUG-87671 +android: SUBDIRS -= \ + dom