diff options
-rw-r--r-- | coin/instructions/cmake_setup_running_tests_env_vars.yaml | 3 | ||||
-rw-r--r-- | tests/auto/corelib/global/qlogging/BLACKLIST | 2 | ||||
-rw-r--r-- | tests/auto/corelib/plugin/.prev_CMakeLists.txt | 13 | ||||
-rw-r--r-- | tests/auto/corelib/plugin/CMakeLists.txt | 7 | ||||
-rw-r--r-- | tests/auto/corelib/thread/.prev_CMakeLists.txt | 25 | ||||
-rw-r--r-- | tests/auto/corelib/thread/CMakeLists.txt | 7 | ||||
-rw-r--r-- | tests/auto/gui/kernel/.prev_CMakeLists.txt | 50 | ||||
-rw-r--r-- | tests/auto/gui/kernel/CMakeLists.txt | 7 | ||||
-rw-r--r-- | tests/auto/gui/rhi/.prev_CMakeLists.txt | 4 | ||||
-rw-r--r-- | tests/auto/gui/rhi/CMakeLists.txt | 7 | ||||
-rw-r--r-- | tests/auto/gui/text/qrawfont/BLACKLIST | 2 | ||||
-rw-r--r-- | tests/auto/network/socket/qudpsocket/BLACKLIST | 2 | ||||
-rw-r--r-- | tests/auto/tools/qmake/BLACKLIST | 2 | ||||
-rw-r--r-- | tests/auto/tools/rcc/BLACKLIST | 2 |
14 files changed, 129 insertions, 4 deletions
diff --git a/coin/instructions/cmake_setup_running_tests_env_vars.yaml b/coin/instructions/cmake_setup_running_tests_env_vars.yaml index f7eead7ce6..ac909a95cc 100644 --- a/coin/instructions/cmake_setup_running_tests_env_vars.yaml +++ b/coin/instructions/cmake_setup_running_tests_env_vars.yaml @@ -1,5 +1,8 @@ type: Group instructions: + - type: EnvironmentVariable + variableName: QTEST_ENVIRONMENT + variableValue: "ci" - type: Group instructions: - type: EnvironmentVariable diff --git a/tests/auto/corelib/global/qlogging/BLACKLIST b/tests/auto/corelib/global/qlogging/BLACKLIST index e474064f54..e2d930e37b 100644 --- a/tests/auto/corelib/global/qlogging/BLACKLIST +++ b/tests/auto/corelib/global/qlogging/BLACKLIST @@ -5,3 +5,5 @@ b2qt 64bit [qMessagePattern:backtrace depth,separator] # QTBUG-63915 b2qt 64bit +# QTBUG-85364 +b2qt cmake diff --git a/tests/auto/corelib/plugin/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/.prev_CMakeLists.txt new file mode 100644 index 0000000000..710d471e8a --- /dev/null +++ b/tests/auto/corelib/plugin/.prev_CMakeLists.txt @@ -0,0 +1,13 @@ +# Generated from plugin.pro. + +if(QT_BUILD_SHARED_LIBS) + add_subdirectory(qfactoryloader) +endif() +add_subdirectory(quuid) +if(QT_FEATURE_library) + add_subdirectory(qpluginloader) + add_subdirectory(qlibrary) +endif() +if(QT_BUILD_SHARED_LIBS AND QT_FEATURE_library) + add_subdirectory(qplugin) +endif() diff --git a/tests/auto/corelib/plugin/CMakeLists.txt b/tests/auto/corelib/plugin/CMakeLists.txt index 710d471e8a..13a97ed349 100644 --- a/tests/auto/corelib/plugin/CMakeLists.txt +++ b/tests/auto/corelib/plugin/CMakeLists.txt @@ -9,5 +9,10 @@ if(QT_FEATURE_library) add_subdirectory(qlibrary) endif() if(QT_BUILD_SHARED_LIBS AND QT_FEATURE_library) - add_subdirectory(qplugin) + # special case begin + # QTBUG-85364 + if(NOT LINUX) + add_subdirectory(qplugin) + endif() + # special case end endif() diff --git a/tests/auto/corelib/thread/.prev_CMakeLists.txt b/tests/auto/corelib/thread/.prev_CMakeLists.txt new file mode 100644 index 0000000000..b73d9af059 --- /dev/null +++ b/tests/auto/corelib/thread/.prev_CMakeLists.txt @@ -0,0 +1,25 @@ +# Generated from thread.pro. + +if(QT_FEATURE_thread) + add_subdirectory(qatomicint) + add_subdirectory(qatomicinteger) + add_subdirectory(qatomicpointer) + add_subdirectory(qresultstore) + add_subdirectory(qfuture) + add_subdirectory(qfuturesynchronizer) + add_subdirectory(qmutex) + add_subdirectory(qmutexlocker) + add_subdirectory(qreadlocker) + add_subdirectory(qreadwritelock) + add_subdirectory(qsemaphore) + 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) + add_subdirectory(qfuturewatcher) +endif() diff --git a/tests/auto/corelib/thread/CMakeLists.txt b/tests/auto/corelib/thread/CMakeLists.txt index b73d9af059..8c3e33d6dc 100644 --- a/tests/auto/corelib/thread/CMakeLists.txt +++ b/tests/auto/corelib/thread/CMakeLists.txt @@ -12,7 +12,12 @@ if(QT_FEATURE_thread) add_subdirectory(qreadlocker) add_subdirectory(qreadwritelock) add_subdirectory(qsemaphore) - add_subdirectory(qthread) + # special case begin + # QTBUG-85364 + if(NOT CMAKE_CROSSCOMPILING) + add_subdirectory(qthread) + endif() + # special case end add_subdirectory(qthreadonce) add_subdirectory(qthreadpool) add_subdirectory(qthreadstorage) diff --git a/tests/auto/gui/kernel/.prev_CMakeLists.txt b/tests/auto/gui/kernel/.prev_CMakeLists.txt new file mode 100644 index 0000000000..33c8b35391 --- /dev/null +++ b/tests/auto/gui/kernel/.prev_CMakeLists.txt @@ -0,0 +1,50 @@ +# Generated from kernel.pro. + +if(QT_FEATURE_action) + add_subdirectory(qaction) + add_subdirectory(qactiongroup) +endif() +add_subdirectory(qbackingstore) +add_subdirectory(qcursor) +add_subdirectory(qdrag) +add_subdirectory(qevent) +add_subdirectory(qfileopenevent) +add_subdirectory(qguieventdispatcher) +add_subdirectory(qguitimer) +add_subdirectory(qinputdevice) +add_subdirectory(qinputmethod) +add_subdirectory(qkeyevent) +add_subdirectory(qmouseevent) +add_subdirectory(qpalette) +add_subdirectory(qscreen) +add_subdirectory(qsurfaceformat) +add_subdirectory(qwindow) +add_subdirectory(qguiapplication) +add_subdirectory(qpixelformat) +add_subdirectory(qrasterwindow) +add_subdirectory(qaddpostroutine) +if(NOT ANDROID AND NOT UIKIT) + add_subdirectory(qclipboard) +endif() +if(TARGET Qt::Network) + add_subdirectory(qguieventloop) +endif() +if(QT_FEATURE_shortcut) + add_subdirectory(qguimetatype) + add_subdirectory(qguivariant) + add_subdirectory(qkeysequence) + add_subdirectory(qshortcut) +endif() +if(QT_FEATURE_highdpiscaling) + add_subdirectory(qhighdpiscaling) +endif() +if(TARGET Qt::Widgets) + add_subdirectory(qmouseevent_modal) + add_subdirectory(qtouchevent) +endif() +if(QT_FEATURE_opengl) + add_subdirectory(qopenglwindow) +endif() +if(TARGET Qt::Network AND WIN32) + add_subdirectory(noqteventloop) +endif() diff --git a/tests/auto/gui/kernel/CMakeLists.txt b/tests/auto/gui/kernel/CMakeLists.txt index 33c8b35391..690a679833 100644 --- a/tests/auto/gui/kernel/CMakeLists.txt +++ b/tests/auto/gui/kernel/CMakeLists.txt @@ -43,7 +43,12 @@ if(TARGET Qt::Widgets) add_subdirectory(qtouchevent) endif() if(QT_FEATURE_opengl) - add_subdirectory(qopenglwindow) + # special case begin + # QTBUG-85364 + if(NOT LINUX) + add_subdirectory(qopenglwindow) + endif() + # special case end endif() if(TARGET Qt::Network AND WIN32) add_subdirectory(noqteventloop) diff --git a/tests/auto/gui/rhi/.prev_CMakeLists.txt b/tests/auto/gui/rhi/.prev_CMakeLists.txt new file mode 100644 index 0000000000..786e121f00 --- /dev/null +++ b/tests/auto/gui/rhi/.prev_CMakeLists.txt @@ -0,0 +1,4 @@ +# Generated from rhi.pro. + +add_subdirectory(qshader) +add_subdirectory(qrhi) diff --git a/tests/auto/gui/rhi/CMakeLists.txt b/tests/auto/gui/rhi/CMakeLists.txt index 786e121f00..fa069e39b8 100644 --- a/tests/auto/gui/rhi/CMakeLists.txt +++ b/tests/auto/gui/rhi/CMakeLists.txt @@ -1,4 +1,9 @@ # Generated from rhi.pro. add_subdirectory(qshader) -add_subdirectory(qrhi) +# special case begin +# QTBUG-85364 +if(NOT LINUX) + add_subdirectory(qrhi) +endif() +# special case end diff --git a/tests/auto/gui/text/qrawfont/BLACKLIST b/tests/auto/gui/text/qrawfont/BLACKLIST new file mode 100644 index 0000000000..44b3d7d481 --- /dev/null +++ b/tests/auto/gui/text/qrawfont/BLACKLIST @@ -0,0 +1,2 @@ +# QTBUG-85364 +windows-10 gcc cmake diff --git a/tests/auto/network/socket/qudpsocket/BLACKLIST b/tests/auto/network/socket/qudpsocket/BLACKLIST index 109bd4b643..8ac9dad80b 100644 --- a/tests/auto/network/socket/qudpsocket/BLACKLIST +++ b/tests/auto/network/socket/qudpsocket/BLACKLIST @@ -3,6 +3,8 @@ windows-10 msvc-2019 windows-10 msvc-2017 windows-10 msvc-2015 windows-7sp1 +# QTBUG-85364 +windows-10 gcc cmake [readyReadForEmptyDatagram] opensuse-leap [echo] diff --git a/tests/auto/tools/qmake/BLACKLIST b/tests/auto/tools/qmake/BLACKLIST new file mode 100644 index 0000000000..367fc3b94c --- /dev/null +++ b/tests/auto/tools/qmake/BLACKLIST @@ -0,0 +1,2 @@ +# QTBUG-85364 +b2qt cmake diff --git a/tests/auto/tools/rcc/BLACKLIST b/tests/auto/tools/rcc/BLACKLIST new file mode 100644 index 0000000000..367fc3b94c --- /dev/null +++ b/tests/auto/tools/rcc/BLACKLIST @@ -0,0 +1,2 @@ +# QTBUG-85364 +b2qt cmake |