diff options
| author | Fawzi Mohamed <fawzi.mohamed@qt.io> | 2020-08-11 06:28:55 +0200 |
|---|---|---|
| committer | Fawzi Mohamed <fawzi.mohamed@qt.io> | 2020-08-11 10:58:28 +0200 |
| commit | 212c5212c652d517901bbbd9581120b938a10f69 (patch) | |
| tree | bfb2239ec58fae5b7d504b0af5f79fafca613c85 /tests/auto/qml/qqmlmoduleplugin | |
| parent | d1a43e4a37cb6bbe0dfcbacd4ce975b0ce0090f0 (diff) | |
Fix tst_qqmlmoduleplugin on mac
* warn and assume case unsensitivity if pathconf fails (on FAT32 for
example)
* adjust library name for debug compilation
Change-Id: I2ec45d5da35974b61c6e316738a59f2962532aed
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'tests/auto/qml/qqmlmoduleplugin')
| -rw-r--r-- | tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp b/tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp index 4979bc6c2d..72f38f16d6 100644 --- a/tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp +++ b/tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp @@ -272,8 +272,15 @@ void tst_qqmlmoduleplugin::incorrectPluginCase() #if defined(Q_OS_MAC) || defined(Q_OS_WIN32) bool caseSensitive = true; #if defined(Q_OS_MAC) - caseSensitive = pathconf(QDir::currentPath().toLatin1().constData(), _PC_CASE_SENSITIVE); + int res = pathconf(QDir::currentPath().toLatin1().constData(), _PC_CASE_SENSITIVE); + if (res == -1) + QSKIP("Could not establish case sensitivity of file system"); + caseSensitive = res != 0 && res != -1; +#ifdef QT_DEBUG + QString libname = "libPluGin_debug.dylib"; +#else QString libname = "libPluGin.dylib"; +#endif #elif defined(Q_OS_WIN32) caseSensitive = false; QString libname = "PluGin.dll"; |