diff options
| author | Pasi Petäjäjärvi <pasi.petajajarvi@qt.io> | 2022-01-19 12:58:07 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-01-25 04:15:46 +0000 |
| commit | 71c84548d0eaa23f0f5eb4229db2ea74146112bf (patch) | |
| tree | 0f9b39507c1661b1eb0f6ce4e8bb4f27771f987b | |
| parent | be61a2b8aa804bc8de4fd7677f6ddff4ddb25413 (diff) | |
QML: Host only tests
Change-Id: I7c0f65868258bd706d9c55022d3546f2b1cb771a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
(cherry picked from commit 3199567e96027e32f50d702ba65dede370cbd93e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | tests/auto/cmake/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | tests/auto/qml/CMakeLists.txt | 2 |
2 files changed, 10 insertions, 6 deletions
diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt index 1af21f99e1..1d75a0bdba 100644 --- a/tests/auto/cmake/CMakeLists.txt +++ b/tests/auto/cmake/CMakeLists.txt @@ -54,10 +54,12 @@ endif() _qt_internal_test_module_includes(${module_includes}) if(TARGET Qt::Qml) - _qt_internal_test_expect_pass(tooling_imports TESTNAME cmake_tooling_imports BINARY cmake_test) - set_tests_properties(cmake_tooling_imports PROPERTIES - FAIL_REGULAR_EXPRESSION "(Info|Warning|Error): [a-zA-Z]*\\.qml:[0-9]" - ) + if(NOT CMAKE_CROSSCOMPILING) + _qt_internal_test_expect_pass(tooling_imports TESTNAME cmake_tooling_imports BINARY cmake_test) + set_tests_properties(cmake_tooling_imports PROPERTIES + FAIL_REGULAR_EXPRESSION "(Info|Warning|Error): [a-zA-Z]*\\.qml:[0-9]" + ) + endif() # TODO: Plugin targets are not available in shared builds at the moment QTBUG-94066 if(NOT QT6_IS_SHARED_LIBS_BUILD) _qt_internal_test_expect_pass(test_plugins) @@ -67,7 +69,9 @@ if(TARGET Qt::Qml) endif() if(TARGET Qt::Quick) - _qt_internal_test_expect_pass(qtquickcompiler BINARY qqc_test) + if(NOT CMAKE_CROSSCOMPILING) + _qt_internal_test_expect_pass(qtquickcompiler BINARY qqc_test) + endif() if(NOT QT6_IS_SHARED_LIBS_BUILD) _qt_internal_test_expect_pass(test_import_static_shapes_plugin_resources BINARY "${CMAKE_CTEST_COMMAND}" diff --git a/tests/auto/qml/CMakeLists.txt b/tests/auto/qml/CMakeLists.txt index 8210ed6c27..7dde117187 100644 --- a/tests/auto/qml/CMakeLists.txt +++ b/tests/auto/qml/CMakeLists.txt @@ -53,7 +53,7 @@ endif() if(QT_FEATURE_process AND QT_FEATURE_qml_debug) add_subdirectory(debugger) endif() -if(QT_FEATURE_process AND NOT boot2qt AND NOT ANDROID) +if(QT_FEATURE_process AND NOT CMAKE_CROSSCOMPILING) add_subdirectory(qmlformat) add_subdirectory(qmlimportscanner) add_subdirectory(qmllint) |