CMake: Skip / ignore failing tests on CMake platforms
Skip crashing tests and ignore failing tests on CMake platforms. Add missing QTEST_ENVIRONMENT=ci env var assignment to Coin test instructions. This was hardcoded by the Coin code for qmake configurations. Task-number: QTBUG-85364 Change-Id: Id2312e504a0d36b8f8596d4cebaa49c63731406e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
parent
bb5757f0cd
commit
5d6705c567
@ -1,5 +1,8 @@
|
||||
type: Group
|
||||
instructions:
|
||||
- type: EnvironmentVariable
|
||||
variableName: QTEST_ENVIRONMENT
|
||||
variableValue: "ci"
|
||||
- type: Group
|
||||
instructions:
|
||||
- type: EnvironmentVariable
|
||||
|
@ -5,3 +5,5 @@ b2qt 64bit
|
||||
[qMessagePattern:backtrace depth,separator]
|
||||
# QTBUG-63915
|
||||
b2qt 64bit
|
||||
# QTBUG-85364
|
||||
b2qt cmake
|
||||
|
13
tests/auto/corelib/plugin/.prev_CMakeLists.txt
Normal file
13
tests/auto/corelib/plugin/.prev_CMakeLists.txt
Normal file
@ -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()
|
@ -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()
|
||||
|
25
tests/auto/corelib/thread/.prev_CMakeLists.txt
Normal file
25
tests/auto/corelib/thread/.prev_CMakeLists.txt
Normal file
@ -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()
|
@ -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)
|
||||
|
50
tests/auto/gui/kernel/.prev_CMakeLists.txt
Normal file
50
tests/auto/gui/kernel/.prev_CMakeLists.txt
Normal file
@ -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()
|
@ -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)
|
||||
|
4
tests/auto/gui/rhi/.prev_CMakeLists.txt
Normal file
4
tests/auto/gui/rhi/.prev_CMakeLists.txt
Normal file
@ -0,0 +1,4 @@
|
||||
# Generated from rhi.pro.
|
||||
|
||||
add_subdirectory(qshader)
|
||||
add_subdirectory(qrhi)
|
@ -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
|
||||
|
2
tests/auto/gui/text/qrawfont/BLACKLIST
Normal file
2
tests/auto/gui/text/qrawfont/BLACKLIST
Normal file
@ -0,0 +1,2 @@
|
||||
# QTBUG-85364
|
||||
windows-10 gcc cmake
|
@ -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]
|
||||
|
2
tests/auto/tools/qmake/BLACKLIST
Normal file
2
tests/auto/tools/qmake/BLACKLIST
Normal file
@ -0,0 +1,2 @@
|
||||
# QTBUG-85364
|
||||
b2qt cmake
|
2
tests/auto/tools/rcc/BLACKLIST
Normal file
2
tests/auto/tools/rcc/BLACKLIST
Normal file
@ -0,0 +1,2 @@
|
||||
# QTBUG-85364
|
||||
b2qt cmake
|
Loading…
x
Reference in New Issue
Block a user