Fix aggregateDependencyLinking() with XCode 9.4

Test failed because of the warning about macOS version mismatch which
leaded to additional logging in
CommandLineFrontend::handleProcessResultReport()

Fixes: QBS-1456
Change-Id: I83dd0eeebd248c0a5ad38b65e29b96358f455404
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

2 files changed, 7 insertions, 2 deletions

diff --git a/tests/auto/blackbox/testdata-apple/aggregateDependencyLinking/aggregateDependencyLinking.qbs b/tests/auto/blackbox/testdata-apple/aggregateDependencyLinking/aggregateDependencyLinking.qbs
index e7c8867bd..a65dcd023 100644
--- a/tests/auto/blackbox/testdata-apple/aggregateDependencyLinking/aggregateDependencyLinking.qbs
+++ b/tests/auto/blackbox/testdata-apple/aggregateDependencyLinking/aggregateDependencyLinking.qbs
@@ -14,6 +14,7 @@ Project {
         // This will generate 2 multiplex configs and an aggregate.
         qbs.architectures: ["x86", "x86_64"]
         qbs.buildVariant: "debug"
+        cpp.minimumMacosVersion: "10.8"
     }
 
     CppApplication {
@@ -30,6 +31,7 @@ Project {
 
         qbs.architecture: "x86_64"
         qbs.buildVariant: "debug"
+        cpp.minimumMacosVersion: "10.8"
         multiplexByQbsProperties: []
     }
 }
diff --git a/tests/auto/blackbox/tst_blackboxapple.cpp b/tests/auto/blackbox/tst_blackboxapple.cpp
index 21cecf9ad..ff7afd274 100644
--- a/tests/auto/blackbox/tst_blackboxapple.cpp
+++ b/tests/auto/blackbox/tst_blackboxapple.cpp
@@ -212,8 +212,11 @@ void TestBlackboxApple::appleMultiConfig()
 
 void TestBlackboxApple::aggregateDependencyLinking()
 {
-    if (HostOsInfo::hostOsVersion() > qbs::Version(10, 13, 4))
-        QSKIP("32-bit arch build is no longer supported on macOS versions higher than 10.13.4.");
+    // XCode 11 produces warning about deprecation of 32-bit apps, so skip the test
+    // for future XCode versions as well
+    const auto xcodeVersion = findXcodeVersion();
+    if (xcodeVersion >= qbs::Version(11))
+        QSKIP("32-bit arch build is no longer supported on macOS higher than 10.13.4.");
 
     QDir::setCurrent(testDataDir + "/aggregateDependencyLinking");
     QCOMPARE(runQbs(QStringList{"-p", "multi_arch_lib"}), 0);