Tests: avoid almostPlugin on CYGWIN
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:
parent
d1539331dd
commit
6f891f3ccb
@ -11,7 +11,7 @@ add_subdirectory(lib)
|
|||||||
add_subdirectory(staticplugin)
|
add_subdirectory(staticplugin)
|
||||||
add_subdirectory(theplugin)
|
add_subdirectory(theplugin)
|
||||||
add_subdirectory(tst)
|
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)
|
add_subdirectory(almostplugin)
|
||||||
endif()
|
endif()
|
||||||
if(MACOS AND QT_FEATURE_private_tests AND TARGET Qt::Gui)
|
if(MACOS AND QT_FEATURE_private_tests AND TARGET Qt::Gui)
|
||||||
|
@ -26,7 +26,7 @@ if (UNIX)
|
|||||||
if(NOT APPLE)
|
if(NOT APPLE)
|
||||||
add_dependencies(tst_qpluginloader theoldplugin)
|
add_dependencies(tst_qpluginloader theoldplugin)
|
||||||
endif()
|
endif()
|
||||||
if (NOT ANDROID AND NOT APPLE)
|
if (NOT ANDROID AND NOT APPLE AND NOT CYGWIN)
|
||||||
add_dependencies(tst_qpluginloader almostplugin)
|
add_dependencies(tst_qpluginloader almostplugin)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
@ -289,7 +289,7 @@ void tst_QPluginLoader::errorString()
|
|||||||
|
|
||||||
// A bug in QNX causes the test to crash on exit after attempting to load
|
// 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).
|
// 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
|
QPluginLoader loader( sys_qualifiedLibraryName("almostplugin")); //a plugin with unresolved symbols
|
||||||
loader.setLoadHints(QLibrary::ResolveAllSymbolsHint);
|
loader.setLoadHints(QLibrary::ResolveAllSymbolsHint);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user