diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-10-12 13:17:46 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-10-12 13:17:46 +0200 |
| commit | 6f3e1896fa567bca8a9f3d35ea26cae518a9313e (patch) | |
| tree | 7475ec4153bece275efc1a97d5fa7420aa07a880 /tests/auto/blackbox/tst_blackboxapple.cpp | |
| parent | ec709675476e507ea094348091b0475084de976e (diff) | |
| parent | fa5e42f915211637da0d6461c9764962ee47f923 (diff) | |
Merge 1.12 into master
Change-Id: I96c735aeda89e02f1fa9107ecfc10ebf4b554dbc
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 76234e6c8..0cb4d5abb 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(QbsRunParameters(QStringList{"qbs.installPrefix:''"})), 0); + QCOMPARE(runQbs(QbsRunParameters(QStringList{ + "qbs.installPrefix:''", + 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" |