1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tst_QPlugin: Be specific when looking for plugins

Browse Source 
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 <volker.hilsheimer@qt.io>
(cherry picked from commit 087ace615a6399f6bf7a020bce07365689bd4784)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Tor Arne Vestbø 2024-06-16 19:11:30 +02:00 committed by Qt Cherry-pick Bot
parent 34ac282a1e
commit b14c1c1824
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/auto/corelib/plugin/qplugin/tst_qplugin.cpp
View File

@ -49,7 +49,7 @@ void tst_QPlugin::initTestCase()
void tst_QPlugin::loadDebugPlugin() 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()) if (fileNames.isEmpty())
QSKIP("No debug plugins found - skipping test"); QSKIP("No debug plugins found - skipping test");
@ -82,7 +82,7 @@ void tst_QPlugin::loadDebugPlugin()
void tst_QPlugin::loadReleasePlugin() 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()) if (fileNames.isEmpty())
QSKIP("No release plugins found - skipping test"); QSKIP("No release plugins found - skipping test");
@ -180,7 +180,7 @@ void tst_QPlugin::scanInvalidPlugin()
#if defined(Q_OS_MACOS) && defined(Q_PROCESSOR_ARM) #if defined(Q_OS_MACOS) && defined(Q_PROCESSOR_ARM)
QSKIP("This test crashes on ARM macOS"); QSKIP("This test crashes on ARM macOS");
#endif #endif
const auto fileNames = dir.entryList({"*invalid*"}, QDir::Files); const auto fileNames = dir.entryList({"*invalidplugin*"}, QDir::Files);
QString invalidPluginName; QString invalidPluginName;
if (fileNames.isEmpty()) if (fileNames.isEmpty())
QSKIP("No invalid plugin found - skipping test"); QSKIP("No invalid plugin found - skipping test");