From b14c1c1824eb4775b6358b66eefa0e243c98b954 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Sun, 16 Jun 2024 19:11:30 +0200 Subject: [PATCH] tst_QPlugin: Be specific when looking for plugins The pattern "*debug*" also matches libinvalidplugin_debug.dylib on macOS. As the CMake target for the plugins include the 'plugin' part, let's look for that as well when finding matching plugins. Change-Id: Icf3177d42c104829890a8c404a6b9782bf190bb4 Reviewed-by: Volker Hilsheimer (cherry picked from commit 087ace615a6399f6bf7a020bce07365689bd4784) Reviewed-by: Qt Cherry-pick Bot --- tests/auto/corelib/plugin/qplugin/tst_qplugin.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/auto/corelib/plugin/qplugin/tst_qplugin.cpp b/tests/auto/corelib/plugin/qplugin/tst_qplugin.cpp index 3d3cb8330d0..9443ba9e5c1 100644 --- a/tests/auto/corelib/plugin/qplugin/tst_qplugin.cpp +++ b/tests/auto/corelib/plugin/qplugin/tst_qplugin.cpp @@ -49,7 +49,7 @@ void tst_QPlugin::initTestCase() void tst_QPlugin::loadDebugPlugin() { - const auto fileNames = dir.entryList(QStringList() << "*debug*", QDir::Files); + const auto fileNames = dir.entryList(QStringList() << "*debugplugin*", QDir::Files); if (fileNames.isEmpty()) QSKIP("No debug plugins found - skipping test"); @@ -82,7 +82,7 @@ void tst_QPlugin::loadDebugPlugin() void tst_QPlugin::loadReleasePlugin() { - const auto fileNames = dir.entryList(QStringList() << "*release*", QDir::Files); + const auto fileNames = dir.entryList(QStringList() << "*releaseplugin*", QDir::Files); if (fileNames.isEmpty()) QSKIP("No release plugins found - skipping test"); @@ -180,7 +180,7 @@ void tst_QPlugin::scanInvalidPlugin() #if defined(Q_OS_MACOS) && defined(Q_PROCESSOR_ARM) QSKIP("This test crashes on ARM macOS"); #endif - const auto fileNames = dir.entryList({"*invalid*"}, QDir::Files); + const auto fileNames = dir.entryList({"*invalidplugin*"}, QDir::Files); QString invalidPluginName; if (fileNames.isEmpty()) QSKIP("No invalid plugin found - skipping test");