diff options
author | Ivan Komissarov <ABBAPOH@gmail.com> | 2019-04-25 20:51:13 +0200 |
---|---|---|
committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2019-04-26 08:49:31 +0000 |
commit | e5036d2567c92eb309fbe32cbf2cdc11d406edc5 (patch) | |
tree | ab44c29d64ab6c696cdb0056f39ce68c2eb92419 /tests | |
parent | 7a96709f4566135ae3d5880d509c238e12e3d241 (diff) |
Print LC_BUILD_VERSION instead of LC_VERSION_MIN_MACOSX
LC_BUILD_VERSION was introduced in apple clang 10.0
Change-Id: I06dd5bba7cab7d28d83c50f2878b5b434e97cca0
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/blackbox/testdata/minimumSystemVersion/main.mm | 13 | ||||
-rw-r--r-- | tests/auto/blackbox/tst_blackbox.cpp | 9 |
2 files changed, 18 insertions, 4 deletions
diff --git a/tests/auto/blackbox/testdata/minimumSystemVersion/main.mm b/tests/auto/blackbox/testdata/minimumSystemVersion/main.mm index cd5a8ec75..23d31c85e 100644 --- a/tests/auto/blackbox/testdata/minimumSystemVersion/main.mm +++ b/tests/auto/blackbox/testdata/minimumSystemVersion/main.mm @@ -54,7 +54,20 @@ int main() if (print && [line rangeOfString:@"version"].location != NSNotFound) { std::cout << [[line stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]] UTF8String] << std::endl; print = false; + continue; } + +#ifdef __clang__ +#if __clang_major__ >= 10 && __clang_minor__ >= 0 + if ([line rangeOfString:@"LC_BUILD_VERSION"].location != NSNotFound) + print = true; + + if (print && [line rangeOfString:@"minos"].location != NSNotFound) { + std::cout << [[line stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]] UTF8String] << std::endl; + print = false; + } +#endif +#endif // __clang__ } } diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp index 27a12eff7..06165271b 100644 --- a/tests/auto/blackbox/tst_blackbox.cpp +++ b/tests/auto/blackbox/tst_blackbox.cpp @@ -6472,10 +6472,11 @@ void TestBlackbox::minimumSystemVersion_data() const auto v = defaultClangMinimumDeploymentTarget(); auto result = "__MAC_OS_X_VERSION_MIN_REQUIRED=" + QString::number(toMinimumDeploymentTargetValue(v, true)); - if (v < qbs::Version(10, 14)) { - result += "\nversion " - + QString::number(v.majorVersion()) + "." + QString::number(v.minorVersion()); - } + if (v >= qbs::Version(10, 14)) + result += "\nminos "; + else + result += "\nversion "; + result += QString::number(v.majorVersion()) + "." + QString::number(v.minorVersion()); return result; } |