From 5d6705c567e73b943bc8f67eb049ce3fa2ba1b74 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 1 Jul 2020 11:13:15 +0200 Subject: 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 Reviewed-by: Joerg Bornemann --- tests/auto/gui/kernel/.prev_CMakeLists.txt | 50 ++++++++++++++++++++++++++++++ tests/auto/gui/kernel/CMakeLists.txt | 7 ++++- tests/auto/gui/rhi/.prev_CMakeLists.txt | 4 +++ tests/auto/gui/rhi/CMakeLists.txt | 7 ++++- tests/auto/gui/text/qrawfont/BLACKLIST | 2 ++ 5 files changed, 68 insertions(+), 2 deletions(-) create mode 100644 tests/auto/gui/kernel/.prev_CMakeLists.txt create mode 100644 tests/auto/gui/rhi/.prev_CMakeLists.txt create mode 100644 tests/auto/gui/text/qrawfont/BLACKLIST (limited to 'tests/auto/gui') 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 -- cgit v1.2.3