diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2017-06-08 18:43:04 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2017-06-09 09:52:51 +0000 |
| commit | 7d9fe986599cf138cfa237df8fcab44ee61a39e3 (patch) | |
| tree | 36afa12a70009a3d5ae9204d4f38c65458aaffb2 /tests/auto/blackbox/tst_blackboxapple.cpp | |
| parent | 47f5c8f5d58e6dda33fa1c6229800bee2791dd89 (diff) | |
Let the bundleStructure and deploymentTarget tests pass with Xcode < 5
Change-Id: I6efd42e99e85a4475e228bee0c16e562d65745e3
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'tests/auto/blackbox/tst_blackboxapple.cpp')
| -rw-r--r-- | tests/auto/blackbox/tst_blackboxapple.cpp | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/tests/auto/blackbox/tst_blackboxapple.cpp b/tests/auto/blackbox/tst_blackboxapple.cpp index 2af349e96..d0fae8e63 100644 --- a/tests/auto/blackbox/tst_blackboxapple.cpp +++ b/tests/auto/blackbox/tst_blackboxapple.cpp @@ -254,9 +254,10 @@ void TestBlackboxApple::bundleStructure() if (isShallow) { // Coerce shallow bundles - don't set bundle.isShallow directly because we want to test the // automatic detection + const auto xcode5 = findXcodeVersion() >= qbs::Internal::Version(5); params.arguments << "qbs.targetOS:ios,darwin,bsd,unix" - << "qbs.architectures:arm64"; + << (xcode5 ? "qbs.architectures:arm64" : "qbs.architectures:armv7a"); } if (productName == "ABadApple" || productName == "ABadThirdParty") @@ -546,15 +547,17 @@ void TestBlackboxApple::deploymentTarget_data() QTest::newRow("ios armv7s") << "iphoneos" <<ios << "armv7s" << "-triple thumbv7s-apple-ios7.0" << "-iphoneos_version_min 7.0"; - QTest::newRow("ios arm64") << "iphoneos" <<ios << "arm64" - << "-triple arm64-apple-ios7.0" - << "-iphoneos_version_min 7.0"; + if (xcodeVersion >= qbs::Internal::Version(5)) + QTest::newRow("ios arm64") << "iphoneos" <<ios << "arm64" + << "-triple arm64-apple-ios7.0" + << "-iphoneos_version_min 7.0"; QTest::newRow("ios-simulator x86") << "iphonesimulator" << ios_sim << "x86" << "-triple i386-apple-ios6.0" << "-ios_simulator_version_min 6.0"; - QTest::newRow("ios-simulator x86_64") << "iphonesimulator" << ios_sim << "x86_64" - << "-triple x86_64-apple-ios7.0" - << "-ios_simulator_version_min 7.0"; + if (xcodeVersion >= qbs::Internal::Version(5)) + QTest::newRow("ios-simulator x86_64") << "iphonesimulator" << ios_sim << "x86_64" + << "-triple x86_64-apple-ios7.0" + << "-ios_simulator_version_min 7.0"; if (xcodeVersion >= qbs::Internal::Version(7)) { if (xcodeVersion >= qbs::Internal::Version(7, 1)) { |