diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-10-05 14:25:04 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-10-05 12:52:50 +0000 |
| commit | ebbcf3e7081725124ed8d39213e7a35e7261fdab (patch) | |
| tree | 25216b85ff57479625e554ad0bf6b2e57f4dd464 /tests/auto/blackbox/tst_blackboxapple.cpp | |
| parent | 1e70e6759b13a926811fc4b291bcc67f0e477b01 (diff) | |
Fix autotests for Xcode 10
Change-Id: I0d218f415eedbfc75c2cf10877646f6831f38f89
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'tests/auto/blackbox/tst_blackboxapple.cpp')
| -rw-r--r-- | tests/auto/blackbox/tst_blackboxapple.cpp | 22 |
1 files changed, 14 insertions, 8 deletions
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" |