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

Tests: avoid almostPlugin on CYGWIN

Browse Source 
On CYGWIN, the build process of almostPlugin fails with this error:

qtbase/tests/auto/corelib/plugin/qpluginloader/almostplugin/CMakeFiles/almostplugin.dir/almostplugin.cpp.o: in function `AlmostPlugin::pluginName() const':
qtbase/tests/auto/corelib/plugin/qpluginloader/almostplugin/almostplugin.cpp:9.text+0x2c): undefined reference to `AlmostPlugin::unresolvedSymbol() const'
collect2: error: ld returned 1 exit status

This is correct, CYGWIN doesn't support that, like MinGW.
Attached patch fixes the error, according to the suggestions here:

Task-number: QTBUG-133778
Change-Id: I9fc261942200f62a5975cd91cb970472e5fca721
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Carlo Bramini 2025-03-02 16:27:17 +01:00 committed by Thiago Macieira
parent d1539331dd
commit 6f891f3ccb
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/corelib/plugin/qpluginloader/CMakeLists.txt
View File

@ -11,7 +11,7 @@ add_subdirectory(lib)
add_subdirectory(staticplugin)
add_subdirectory(theplugin)
add_subdirectory(tst)
if(UNIX AND NOT ANDROID AND NOT APPLE)
if(UNIX AND NOT ANDROID AND NOT APPLE AND NOT CYGWIN)
add_subdirectory(almostplugin)
endif()
if(MACOS AND QT_FEATURE_private_tests AND TARGET Qt::Gui)

2
tests/auto/corelib/plugin/qpluginloader/tst/CMakeLists.txt
View File

@ -26,7 +26,7 @@ if (UNIX)
if(NOT APPLE)
add_dependencies(tst_qpluginloader theoldplugin)
endif()
if (NOT ANDROID AND NOT APPLE)
if (NOT ANDROID AND NOT APPLE AND NOT CYGWIN)
add_dependencies(tst_qpluginloader almostplugin)
endif()
endif()

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

@ -289,7 +289,7 @@ void tst_QPluginLoader::errorString()
// A bug in QNX causes the test to crash on exit after attempting to load
// a shared library with undefined symbols (tracked as QTBUG-114682).
#if !defined(Q_OS_WIN) && !defined(Q_OS_DARWIN) && !defined(Q_OS_HPUX) && !defined(Q_OS_QNX)
#if defined(Q_OF_ELF) && !defined(Q_OS_QNX)
{
QPluginLoader loader( sys_qualifiedLibraryName("almostplugin")); //a plugin with unresolved symbols
loader.setLoadHints(QLibrary::ResolveAllSymbolsHint);