diff options
Diffstat (limited to 'tests/auto/corelib')
23 files changed, 111 insertions, 17 deletions
diff --git a/tests/auto/corelib/kernel/.prev_CMakeLists.txt b/tests/auto/corelib/kernel/.prev_CMakeLists.txt index 154cc8e766..31e9a7bb16 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 85d80e7a3d..bb7a665c76 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 627407b0e4..ef385a7798 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 710d471e8a..9abd791c92 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 13a97ed349..e0ac398144 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 240608fddf..c153fa37d9 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 0000000000..b5ee66fe84 --- /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 eb50b6f59c..aef7d7aa26 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 93efdf2d71..5b53538b9e 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 0000000000..767f54e9d0 --- /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 0000000000..0bf1982277 --- /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 f03f28936a..24645c850c 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 b73d9af059..15e7939445 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 8c3e33d6dc..931d8f0c6a 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 0000000000..406fb7cc1c --- /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 0000000000..84906ff86e --- /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 510614ef66..d6e24b9b33 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 0000000000..c1f1367c86 --- /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 0000000000..cca233512e --- /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 b820bab3d9..ddc9a107c0 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 02dec30c5d..6bd31465bd 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 be0c4932c6..bf6a97bc07 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 0557b69e5c..c0519a5c5e 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 |