Fix autotests for Xcode 10

Change-Id: I0d218f415eedbfc75c2cf10877646f6831f38f89
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

10 files changed, 40 insertions, 31 deletions

diff --git a/tests/auto/blackbox/testdata-apple/apple-multiconfig/apple-multiconfig.qbs b/tests/auto/blackbox/testdata-apple/apple-multiconfig/apple-multiconfig.qbs
index ae2fcd402..842593c46 100644
--- a/tests/auto/blackbox/testdata-apple/apple-multiconfig/apple-multiconfig.qbs
+++ b/tests/auto/blackbox/testdata-apple/apple-multiconfig/apple-multiconfig.qbs
@@ -3,6 +3,7 @@ import qbs.Utilities
 
 Project {
     minimumQbsVersion: "1.8"
+    property bool enableX86
 
     CppApplication {
         Depends { name: "singlelib" }
@@ -11,7 +12,7 @@ Project {
         targetName: "singleapp"
         files: ["app.c"]
         cpp.rpaths: [cpp.rpathOrigin + "/../../../"]
-        cpp.minimumMacosVersion: "10.5"
+        cpp.minimumMacosVersion: "10.6"
 
         // Turn off multiplexing
         aggregate: false
@@ -31,7 +32,7 @@ Project {
         targetName: "singleapp_agg"
         files: ["app.c"]
         cpp.rpaths: [cpp.rpathOrigin + "/../../../"]
-        cpp.minimumMacosVersion: "10.5"
+        cpp.minimumMacosVersion: "10.6"
 
         // Force aggregation when not needed
         aggregate: true
@@ -72,7 +73,7 @@ Project {
         targetName: "multiapp"
         files: ["app.c"]
         cpp.rpaths: [cpp.rpathOrigin + "/../../../"]
-        cpp.minimumMacosVersion: "10.5"
+        cpp.minimumMacosVersion: "10.6"
 
         Group {
             fileTagsFilter: ["bundle.content"]
@@ -88,8 +89,10 @@ Project {
         targetName: "fatmultiapp"
         files: ["app.c"]
         cpp.rpaths: [cpp.rpathOrigin + "/../../../"]
-        cpp.minimumMacosVersion: "10.5"
-        qbs.architectures: ["x86", "x86_64"]
+        cpp.minimumMacosVersion: "10.6"
+        qbs.architectures: project.enableX86 ? ["x86", "x86_64"] : ["x86_64"]
+        qbs.architecture: "x86_64"
+        multiplexByQbsProperties: project.enableX86 ? ["architectures"] : []
 
         Group {
             fileTagsFilter: ["bundle.content"]
@@ -105,8 +108,8 @@ Project {
         targetName: "fatmultiappmultivariant"
         files: ["app.c"]
         cpp.rpaths: [cpp.rpathOrigin + "/../../../"]
-        cpp.minimumMacosVersion: "10.5"
-        qbs.architectures: ["x86", "x86_64"]
+        cpp.minimumMacosVersion: "10.6"
+        qbs.architectures: project.enableX86 ? ["x86", "x86_64"] : ["x86_64"]
         qbs.buildVariants: ["debug", "profile"]
 
         Group {
@@ -124,7 +127,7 @@ Project {
         files: ["lib.c"]
         cpp.sonamePrefix: qbs.targetOS.contains("darwin") ? "@rpath" : undefined
         cpp.defines: ["VARIANT=" + Utilities.cStringQuote(qbs.buildVariant)]
-        qbs.architectures: ["x86", "x86_64"]
+        qbs.architectures: project.enableX86 ? ["x86", "x86_64"] : ["x86_64"]
         qbs.buildVariants: ["release", "debug", "profile"]
 
         Group {
@@ -142,7 +145,7 @@ Project {
         files: ["lib.c"]
         cpp.sonamePrefix: qbs.targetOS.contains("darwin") ? "@rpath" : undefined
         cpp.defines: ["VARIANT=" + Utilities.cStringQuote(qbs.buildVariant)]
-        qbs.architectures: ["x86", "x86_64"]
+        qbs.architectures: project.enableX86 ? ["x86", "x86_64"] : ["x86_64"]
         qbs.buildVariants: ["debug", "profile"]
 
         Group {
@@ -160,7 +163,7 @@ Project {
         files: ["lib.c"]
         cpp.sonamePrefix: "@rpath"
         cpp.defines: ["VARIANT=" + Utilities.cStringQuote(qbs.buildVariant)]
-        qbs.architectures: ["x86", "x86_64"]
+        qbs.architectures: project.enableX86 ? ["x86", "x86_64"] : ["x86_64"]
         qbs.buildVariants: ["debug", "profile"]
         Group {
             fileTagsFilter: ["bundle.content"]
@@ -175,7 +178,7 @@ Project {
         files: ["lib.c"]
         cpp.sonamePrefix: "@rpath"
         cpp.defines: ["VARIANT=" + Utilities.cStringQuote(qbs.buildVariant)]
-        qbs.architectures: ["x86", "x86_64"]
+        qbs.architectures: project.enableX86 ? ["x86", "x86_64"] : ["x86_64"]
         qbs.buildVariants: ["debug", "profile"]
         Group {
             fileTagsFilter: ["bundle.content"]
diff --git a/tests/auto/blackbox/testdata-apple/deploymentTarget/deployment.qbs b/tests/auto/blackbox/testdata-apple/deploymentTarget/deployment.qbs
index f805de67c..940fe74f4 100644
--- a/tests/auto/blackbox/testdata-apple/deploymentTarget/deployment.qbs
+++ b/tests/auto/blackbox/testdata-apple/deploymentTarget/deployment.qbs
@@ -6,7 +6,7 @@ CppApplication {
     // Minimum deployment targets that:
     // - will actually link (as of Xcode 8.1)
     // - exist for the given architecture(s)
-    cpp.minimumMacosVersion: qbs.architecture === "x86_64h" ? "10.12" : "10.4"
+    cpp.minimumMacosVersion: qbs.architecture === "x86_64h" ? "10.12" : "10.6"
     cpp.minimumIosVersion: ["armv7s", "arm64", "x86_64"].contains(qbs.architecture) ? "7.0" : "6.0"
     cpp.minimumTvosVersion: "9.0"
     cpp.minimumWatchosVersion: "2.0"
diff --git a/tests/auto/blackbox/testdata-apple/embedInfoPlist/embedInfoPlist.qbs b/tests/auto/blackbox/testdata-apple/embedInfoPlist/embedInfoPlist.qbs
index c0d77aefd..16b00208e 100644
--- a/tests/auto/blackbox/testdata-apple/embedInfoPlist/embedInfoPlist.qbs
+++ b/tests/auto/blackbox/testdata-apple/embedInfoPlist/embedInfoPlist.qbs
@@ -9,7 +9,7 @@ Project {
         files: ["main.m"]
         cpp.frameworks: ["Foundation"]
         cpp.rpaths: [cpp.rpathOrigin]
-        cpp.minimumMacosVersion: "10.5"
+        cpp.minimumMacosVersion: "10.6"
         bundle.infoPlist: ({
             "QBS": "org.qt-project.qbs.testdata.embedInfoPlist"
         })
diff --git a/tests/auto/blackbox/testdata/dynamic-library-in-module/Dll.qbs b/tests/auto/blackbox/testdata/dynamic-library-in-module/Dll.qbs
index 0f897df67..48a90759a 100644
--- a/tests/auto/blackbox/testdata/dynamic-library-in-module/Dll.qbs
+++ b/tests/auto/blackbox/testdata/dynamic-library-in-module/Dll.qbs
@@ -6,7 +6,7 @@ DynamicLibrary {
     Properties {
         condition: qbs.targetOS.contains("darwin")
         bundle.isBundle: false
-        cpp.minimumMacosVersion: "10.5" // For -rpath
+        cpp.minimumMacosVersion: "10.7" // For -rpath
     }
 
     Group {
diff --git a/tests/auto/blackbox/testdata/dynamic-library-in-module/theapp.qbs b/tests/auto/blackbox/testdata/dynamic-library-in-module/theapp.qbs
index 6bd0de9ab..725968dae 100644
--- a/tests/auto/blackbox/testdata/dynamic-library-in-module/theapp.qbs
+++ b/tests/auto/blackbox/testdata/dynamic-library-in-module/theapp.qbs
@@ -3,7 +3,7 @@ import qbs
 Project {
     CppApplication {
         name: "theapp"
-        cpp.minimumMacosVersion: "10.5" // For -rpath
+        cpp.minimumMacosVersion: "10.7" // For -rpath
         Depends { name: "theotherlib" }
         Depends { name: "thethirdlib" }
         Depends { name: "thefourthlib" }
diff --git a/tests/auto/blackbox/testdata/minimumSystemVersion/macappstore.qbs b/tests/auto/blackbox/testdata/minimumSystemVersion/macappstore.qbs
index 3f214fed2..82cce3e07 100644
--- a/tests/auto/blackbox/testdata/minimumSystemVersion/macappstore.qbs
+++ b/tests/auto/blackbox/testdata/minimumSystemVersion/macappstore.qbs
@@ -8,5 +8,5 @@ CppApplication {
     files: ["main.mm"]
     consoleApplication: true
     cpp.frameworks: "Foundation"
-    cpp.minimumMacosVersion: "10.6.8"
+    cpp.minimumMacosVersion: "10.7.1"
 }
diff --git a/tests/auto/blackbox/testdata/minimumSystemVersion/specific.qbs b/tests/auto/blackbox/testdata/minimumSystemVersion/specific.qbs
index 0d033b394..2af95134a 100644
--- a/tests/auto/blackbox/testdata/minimumSystemVersion/specific.qbs
+++ b/tests/auto/blackbox/testdata/minimumSystemVersion/specific.qbs
@@ -21,6 +21,6 @@ CppApplication {
     Properties {
         condition: qbs.targetOS.contains("macos")
         cpp.frameworks: "Foundation"
-        cpp.minimumMacosVersion: "10.6"
+        cpp.minimumMacosVersion: "10.7"
     }
 }
diff --git a/tests/auto/blackbox/testdata/symbolLinkMode/symbolLinkMode.qbs b/tests/auto/blackbox/testdata/symbolLinkMode/symbolLinkMode.qbs
index 127d459c8..624b1abb0 100644
--- a/tests/auto/blackbox/testdata/symbolLinkMode/symbolLinkMode.qbs
+++ b/tests/auto/blackbox/testdata/symbolLinkMode/symbolLinkMode.qbs
@@ -28,7 +28,7 @@ Project {
             return ["WEAK_IMPORT=", installLib];
         }
         cpp.cxxLanguageVersion: "c++11"
-        cpp.minimumMacosVersion: "10.5"
+        cpp.minimumMacosVersion: "10.7"
         cpp.rpaths: [cpp.rpathOrigin + "/../lib"]
 
         Group {
@@ -49,7 +49,7 @@ Project {
         name: "functions"
         files: ["lib.cpp"]
         cpp.cxxLanguageVersion: "c++11"
-        cpp.minimumMacosVersion: "10.5"
+        cpp.minimumMacosVersion: "10.7"
         cpp.rpaths: [cpp.rpathOrigin]
 
         Properties {
@@ -91,7 +91,7 @@ Project {
         name: "indirect"
         files: ["indirect.cpp"]
         cpp.cxxLanguageVersion: "c++11"
-        cpp.minimumMacosVersion: "10.5"
+        cpp.minimumMacosVersion: "10.7"
 
         Properties {
             condition: qbs.targetOS.contains("darwin")
diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp
index 80d947e9a..7ee5e5cc6 100644
--- a/tests/auto/blackbox/tst_blackbox.cpp
+++ b/tests/auto/blackbox/tst_blackbox.cpp
@@ -5907,7 +5907,7 @@ void TestBlackbox::minimumSystemVersion_data()
 
     const QString specific = []() -> QString {
         if (HostOsInfo::isMacosHost())
-            return "__MAC_OS_X_VERSION_MIN_REQUIRED=1060\nversion 10.6\n";
+            return "__MAC_OS_X_VERSION_MIN_REQUIRED=1070\nversion 10.7\n";
 
         if (HostOsInfo::isWindowsHost())
             return "WINVER=1536\n6.00 operating system version\n6.00 subsystem version\n";
@@ -5923,8 +5923,8 @@ void TestBlackbox::minimumSystemVersion_data()
         QTest::newRow("fakewindows") << "fakewindows" << "WINVER=1283\n5.03 operating system "
                                                          "version\n5.03 subsystem version\n";
     if (HostOsInfo::isMacosHost())
-        QTest::newRow("macappstore") << "macappstore" << "__MAC_OS_X_VERSION_MIN_REQUIRED=1068\n"
-                                                         "version 10.6";
+        QTest::newRow("macappstore") << "macappstore" << "__MAC_OS_X_VERSION_MIN_REQUIRED=1071\n"
+                                                         "version 10.7";
 }
 
 void TestBlackbox::missingBuildGraph()
diff --git a/tests/auto/blackbox/tst_blackboxapple.cpp b/tests/auto/blackbox/tst_blackboxapple.cpp
index c08cc9759..b3ba13f04 100644
--- a/tests/auto/blackbox/tst_blackboxapple.cpp
+++ b/tests/auto/blackbox/tst_blackboxapple.cpp
@@ -76,8 +76,13 @@ void TestBlackboxApple::initTestCase()
 
 void TestBlackboxApple::appleMultiConfig()
 {
+    const auto xcodeVersion = findXcodeVersion();
+    const bool supportsX86 = xcodeVersion < qbs::Version(10);
+
     QDir::setCurrent(testDataDir + "/apple-multiconfig");
-    QCOMPARE(runQbs(), 0);
+
+    QCOMPARE(runQbs(QbsRunParameters(QStringList(QString("project.enableX86:")
+                                                 + (supportsX86 ? "true" : "false")))), 0);
 
     QVERIFY(QFileInfo2(defaultInstallRoot + "/singleapp.app/Contents/MacOS/singleapp").isExecutable());
     QVERIFY(QFileInfo2(defaultInstallRoot + "/singleapp.app/Contents/Info.plist").isRegularFile());
@@ -164,7 +169,6 @@ void TestBlackboxApple::assetCatalog()
     QFETCH(bool, flatten);
 
     const auto xcodeVersion = findXcodeVersion();
-
     QDir::setCurrent(testDataDir + QLatin1String("/ib/assetcatalog"));
 
     rmDirR(relativeBuildDir());
@@ -578,14 +582,16 @@ void TestBlackboxApple::deploymentTarget_data()
     QTest::addColumn<QString>("cflags");
     QTest::addColumn<QString>("lflags");
 
-    QTest::newRow("macos x86") << "macosx" << macos << "x86"
-                         << "-triple i386-apple-macosx10.4"
-                         << "-macosx_version_min 10.4";
+    const auto xcodeVersion = findXcodeVersion();
+    if (xcodeVersion < qbs::Version(10)) {
+        QTest::newRow("macos x86") << "macosx" << macos << "x86"
+                                   << "-triple i386-apple-macosx10.6"
+                                   << "-macosx_version_min 10.6";
+    }
     QTest::newRow("macos x86_64") << "macosx" << macos << "x86_64"
-                         << "-triple x86_64-apple-macosx10.4"
-                         << "-macosx_version_min 10.4";
+                         << "-triple x86_64-apple-macosx10.6"
+                         << "-macosx_version_min 10.6";
 
-    const auto xcodeVersion = findXcodeVersion();
     if (xcodeVersion >= qbs::Version(6))
         QTest::newRow("macos x86_64h") << "macosx" << macos << "x86_64h"
                              << "-triple x86_64h-apple-macosx10.12"