96e3ee0659
The tests/auto/cmake project can be configured separately as a
standalone project with qt-cmake, or as part of the overall qtbase
standalone tests.
To do that a bunch of things were done
- Ported all Qt5 strings to Qt6
- Replaced in all projects the use of add_definitions and
include_directories with a target based approach, except for 2 tests
where we check that the old-style approach works, otherwise the
tests would file
- Removed some (possibly unneeded) EGL / OpenGL tests
- Fixed some C++ code
- Added setup code to tests/auto/cmake/CMakeLists.txt to figure out
which modules are available and should be tested
- Fixed Qt6CTestMacros.cmake to be loaded by Qt6Core
- Removed the CMake tests to not be run in qmake builds of Qt because
they would fail anyway
- Enabled the CMake tests to be part of standalone tests
- Disabled auto-passing of the C and CXX compiler cache vars when
cross-compiling so that the tests can somewhat pass on boot2qt.
This is the issue we encountered in
e2b2cd9397
- Ultimately disabled tests for boot2qt, because the -rpath-link
flag is not generated by CMake for some reason.
- Added code to setup the environment when running an executable that
was built as part of the test, so that the proper Qt libraries are
found. This handles both the standalone tests case and separate
project case.
The remaining unported tests are test_import_plugins which requires
quite a bit of work to get some modules and plugins built that were
done as part of the qmake .pro files, test_plugins that checks
some Network plugins which I'm not sure about, and
test_add_big_resource which doesn't work with namespaced builds
and there's no good way of detecting those at the moment either.
Change-Id: Ic8809c72817d1db81af6c6014c11df6473ad8c75
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
74 lines
2.1 KiB
CMake
74 lines
2.1 KiB
CMake
# special case begin
|
|
# Order by dependency [*], then alphabetic. [*] If bugs in part A of
|
|
# our source would break tests of part B, then test A before B.
|
|
|
|
# Build only corelib and gui tests when targeting uikit (iOS),
|
|
# because the script can't handle the SUBDIRS assignment well.
|
|
if (UIKIT)
|
|
add_subdirectory(corelib)
|
|
if (TARGET Qt::Gui)
|
|
add_subdirectory(gui)
|
|
endif()
|
|
return()
|
|
endif()
|
|
|
|
add_subdirectory(testlib)
|
|
if (NOT CMAKE_CROSSCOMPILE AND QT_FEATURE_process)
|
|
add_subdirectory(tools)
|
|
endif()
|
|
add_subdirectory(corelib)
|
|
add_subdirectory(cmake)
|
|
if (TARGET Qt::Concurrent)
|
|
add_subdirectory(concurrent)
|
|
endif()
|
|
|
|
if (QT_FEATURE_dbus)
|
|
set(run_dbus_tests ON)
|
|
if(NOT CMAKE_CROSSCOMPILING AND TARGET Qt::DBus)
|
|
execute_process(COMMAND dbus-send --session --type=signal / local.AutotestCheck.Hello
|
|
RESULT_VARIABLE dbus_session_test
|
|
OUTPUT_QUIET ERROR_QUIET)
|
|
if(NOT "${dbus_session_test}" STREQUAL "0")
|
|
set(run_dbus_tests OFF)
|
|
if(QT_FEATURE_dbus_linked)
|
|
message(WARNING
|
|
" QtDBus is enabled but session bus is not available for testing.\n"
|
|
" Please check the installation. Skipping QtDBus tests.")
|
|
else()
|
|
message(WARNING
|
|
" QtDBus is enabled with runtime support, but session bus is not available.\n"
|
|
" Skipping QtDBus tests.")
|
|
endif()
|
|
endif()
|
|
endif()
|
|
if(run_dbus_tests)
|
|
add_subdirectory(dbus)
|
|
endif()
|
|
endif()
|
|
|
|
if (TARGET Qt::Gui)
|
|
add_subdirectory(gui)
|
|
endif()
|
|
if (TARGET Qt::Network)
|
|
add_subdirectory(network)
|
|
endif()
|
|
if (TARGET Qt::OpenGL)
|
|
add_subdirectory(opengl)
|
|
endif()
|
|
if (TARGET Qt::PrintSupport)
|
|
add_subdirectory(printsupport)
|
|
endif()
|
|
if (TARGET Qt::Sql)
|
|
add_subdirectory(sql)
|
|
endif()
|
|
if (TARGET Qt::Widgets)
|
|
add_subdirectory(widgets)
|
|
endif()
|
|
if (TARGET Qt::Xml)
|
|
add_subdirectory(xml)
|
|
endif()
|
|
# add_subdirectory(installed_cmake) ## FIXME: Does this still make sense in this form?
|
|
add_subdirectory(other)
|
|
|
|
# special case end
|