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

Fix test when accessing patched plugin too fast

Browse Source 
At least one OS (QNX) can't dlopen() a library that is still
open for writing elsewhere

Pick-to: 6.2
Change-Id: I2d4425d8c69162cdfa43c2523c7459def7839eb9
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Pasi Petäjäjärvi 2021-11-17 18:31:48 +02:00
parent a4dca9936d
commit 7490937609
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp
View File

@ -34,6 +34,7 @@
#include <qendian.h> #include <qendian.h>
#include <qpluginloader.h> #include <qpluginloader.h>
#include <qtemporaryfile.h> #include <qtemporaryfile.h>
#include <QScopeGuard>
#include "theplugin/plugininterface.h" #include "theplugin/plugininterface.h"
#if defined(QT_BUILD_INTERNAL) && defined(Q_OF_MACH_O) #if defined(QT_BUILD_INTERNAL) && defined(Q_OF_MACH_O)
@ -983,11 +984,25 @@ void tst_QPluginLoader::loadSectionTableStrippedElf()
f->seek(f->size()); f->seek(f->size());
f->write(reinterpret_cast<const char *>(&badHeader), sizeof(badHeader)); f->write(reinterpret_cast<const char *>(&badHeader), sizeof(badHeader));
} }; } };
std::unique_ptr<QTemporaryFile> tmplib =
patchElf(sys_qualifiedLibraryName("theplugin"), patcher); QString tmpLibName;
{
std::unique_ptr<QTemporaryFile> tmplib =
patchElf(sys_qualifiedLibraryName("theplugin"), patcher);
tmpLibName = tmplib->fileName();
tmplib->setAutoRemove(false);
}
#if defined(Q_OS_QNX)
// On QNX plugin access is still too early, even when QTemporaryFile is closed
QTest::qSleep(1000);
#endif
auto removeTmpLib = qScopeGuard([=]{
QFile::remove(tmpLibName);
});
// now attempt to load it // now attempt to load it
QPluginLoader loader(tmplib->fileName()); QPluginLoader loader(tmpLibName);
QVERIFY2(loader.load(), qPrintable(loader.errorString())); QVERIFY2(loader.load(), qPrintable(loader.errorString()));
PluginInterface *instance = qobject_cast<PluginInterface*>(loader.instance()); PluginInterface *instance = qobject_cast<PluginInterface*>(loader.instance());
QVERIFY(instance); QVERIFY(instance);