From 7d38268b4a06d0d598b14de7bc4d9fcc58988614 Mon Sep 17 00:00:00 2001 From: Dominik Holland Date: Fri, 19 Mar 2021 17:11:09 +0100 Subject: Fix failing autotests Fix the CMakeLists.txt of servicemanagertest to also link the static_plugins. Fix the qiviqmlconversion_helper to not convert strings to char arrays. Adapt servicemanager autotest to ignore some features which doesn't work yet with cmake. Change-Id: I5b0ff928003858a304a8dc97978a33abf685883d Reviewed-by: Robert Griebl --- tests/auto/core/servicemanagertest/CMakeLists.txt | 2 ++ tests/auto/core/servicemanagertest/tst_servicemanagertest.cpp | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/auto/core/servicemanagertest/CMakeLists.txt b/tests/auto/core/servicemanagertest/CMakeLists.txt index b4dc93f..90bb8e2 100644 --- a/tests/auto/core/servicemanagertest/CMakeLists.txt +++ b/tests/auto/core/servicemanagertest/CMakeLists.txt @@ -12,6 +12,8 @@ qt_add_test(tst_servicemanagertest SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\" PUBLIC_LIBRARIES # Remove: Lqtivi + simple_plugin_static # special case + wrongmetadata_plugin_static # special case Qt::IviCore Qt::IviCorePrivate ) diff --git a/tests/auto/core/servicemanagertest/tst_servicemanagertest.cpp b/tests/auto/core/servicemanagertest/tst_servicemanagertest.cpp index 5c0ba96..1eb2afd 100644 --- a/tests/auto/core/servicemanagertest/tst_servicemanagertest.cpp +++ b/tests/auto/core/servicemanagertest/tst_servicemanagertest.cpp @@ -127,7 +127,8 @@ void ServiceManagerTest::ignoreDynamicPluginWarnings() QTest::ignoreMessage(QtWarningMsg, QRegularExpression("PluginManager - Malformed metaData in '.*'. MetaData must contain a list of interfaces")); # endif - QTest::ignoreMessage(QtInfoMsg, QRegularExpression("Found the same plugin in two configurations. Using the '.*' configuration: .*")); + // FIXME Disabled for cmake porting + // QTest::ignoreMessage(QtInfoMsg, QRegularExpression("Found the same plugin in two configurations. Using the '.*' configuration: .*")); #endif } -- cgit v1.2.1