aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/core/servicemanagertest
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/core/servicemanagertest')
-rw-r--r--tests/auto/core/servicemanagertest/CMakeLists.txt2
-rw-r--r--tests/auto/core/servicemanagertest/tst_servicemanagertest.cpp3
2 files changed, 4 insertions, 1 deletions
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
}