diff options
Diffstat (limited to 'tests/auto/corelib/plugin/qplugin/tst_qplugin.cpp')
-rw-r--r-- | tests/auto/corelib/plugin/qplugin/tst_qplugin.cpp | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/tests/auto/corelib/plugin/qplugin/tst_qplugin.cpp b/tests/auto/corelib/plugin/qplugin/tst_qplugin.cpp index e96204c471..9443ba9e5c 100644 --- a/tests/auto/corelib/plugin/qplugin/tst_qplugin.cpp +++ b/tests/auto/corelib/plugin/qplugin/tst_qplugin.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2020 The Qt Company Ltd. // Copyright (C) 2021 Intel Corporation. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QTest> #include <QCoreApplication> @@ -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"); @@ -57,7 +57,7 @@ void tst_QPlugin::loadDebugPlugin() if (!QLibrary::isLibrary(fileName)) continue; QPluginLoader loader(dir.filePath(fileName)); -#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) +#if defined(Q_OS_UNIX) && !defined(Q_OS_DARWIN) // we can always load a plugin on unix QVERIFY(loader.load()); QObject *object = loader.instance(); @@ -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"); @@ -90,7 +90,7 @@ void tst_QPlugin::loadReleasePlugin() if (!QLibrary::isLibrary(fileName)) continue; QPluginLoader loader(dir.filePath(fileName)); -#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) +#if defined(Q_OS_UNIX) && !defined(Q_OS_DARWIN) // we can always load a plugin on unix QVERIFY(loader.load()); QObject *object = loader.instance(); @@ -152,8 +152,8 @@ void tst_QPlugin::scanInvalidPlugin_data() << " Unexpected metadata contents"; ++cprefix[MagicLen + 0]; - QTest::newRow("cbor-major-too-new") << (cprefix + cborValid) << false - << " Invalid metadata version"; + QTest::newRow("cbor-major-too-new-invalid") + << (cprefix + cborValid) << false << " Invalid metadata version"; } static const char invalidPluginSignature[] = "qplugin testfile"; @@ -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"); @@ -224,10 +224,6 @@ void tst_QPlugin::scanInvalidPlugin() // now try to load this QFETCH(bool, loads); QFETCH(QString, errMsg); - if (!errMsg.isEmpty()) - QTest::ignoreMessage(QtWarningMsg, - "Found invalid metadata in lib " + QFile::encodeName(newName) + - ":" + errMsg.toUtf8()); QPluginLoader loader(newName); QCOMPARE(loader.load(), loads); if (loads) |