diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2014-01-14 15:57:12 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-01-14 16:08:26 +0100 |
| commit | 4f0ee11899479d18597ee84ca4319075fc448053 (patch) | |
| tree | db2376faf22d65b25158a1f7cbb6fb4e044d6c9d | |
| parent | 379f0b2189f1d1bd91752345f45413f48e4807f2 (diff) | |
Fix "clean" autotest on OSX.
Dynamic library names are different on Mac.
Change-Id: I451d61765a91213e5d2e6141848cb2f00cb0d2d9
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| -rw-r--r-- | tests/auto/blackbox/tst_blackbox.cpp | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp index 9b1b31520..e96286856 100644 --- a/tests/auto/blackbox/tst_blackbox.cpp +++ b/tests/auto/blackbox/tst_blackbox.cpp @@ -369,15 +369,21 @@ void TestBlackbox::clean() const QString appObjectFilePath = buildDir + "/.obj/app/main.cpp" + QTC_HOST_OBJECT_SUFFIX; const QString appExeFilePath = buildDir + "/app" + QTC_HOST_EXE_SUFFIX; const QString depObjectFilePath = buildDir + "/.obj/dep/dep.cpp" + QTC_HOST_OBJECT_SUFFIX; - const QString depLibBase = buildDir + '/' + QTC_HOST_DYNAMICLIB_PREFIX + "dep" - + QTC_HOST_DYNAMICLIB_SUFFIX; + const QString depLibBase = buildDir + '/' + QTC_HOST_DYNAMICLIB_PREFIX + "dep"; QString depLibFilePath; QStringList symlinks; - if (qbs::Internal::HostOsInfo::isAnyUnixHost()) { - depLibFilePath = depLibBase + ".1.1.0"; - symlinks << depLibBase + ".1.1" << depLibBase + ".1" << depLibBase; + if (qbs::Internal::HostOsInfo::isOsxHost()) { + depLibFilePath = depLibBase + ".1.1.0" + QTC_HOST_DYNAMICLIB_SUFFIX; + symlinks << depLibBase + ".1.1" + QTC_HOST_DYNAMICLIB_SUFFIX + << depLibBase + ".1" + QTC_HOST_DYNAMICLIB_SUFFIX + << depLibBase + QTC_HOST_DYNAMICLIB_SUFFIX; + } else if (qbs::Internal::HostOsInfo::isAnyUnixHost()) { + depLibFilePath = depLibBase + QTC_HOST_DYNAMICLIB_SUFFIX + ".1.1.0"; + symlinks << depLibBase + QTC_HOST_DYNAMICLIB_SUFFIX + ".1.1" + << depLibBase + QTC_HOST_DYNAMICLIB_SUFFIX + ".1" + << depLibBase + QTC_HOST_DYNAMICLIB_SUFFIX; } else { - depLibFilePath = depLibBase; + depLibFilePath = depLibBase + QTC_HOST_DYNAMICLIB_SUFFIX; } QDir::setCurrent(testDataDir + "/clean"); |