diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2021-03-20 19:57:52 +0300 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2021-03-21 18:00:11 +0000 |
| commit | 20fd97e6096ea30302b63bd88fa6ad92baad2b9c (patch) | |
| tree | a525748fb5c549ff07dcad35ca4e67f47a102596 | |
| parent | 24cdf4a9e418ece66e5001cbb2edce975ba79b51 (diff) | |
Run appleMultiConfig test with arm64 on newer Xcode
Change-Id: If8d579b612d8c44f697495d2ca985f7c34310682
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
| -rw-r--r-- | tests/auto/blackbox/testdata-apple/apple-multiconfig/helpers.js | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/tests/auto/blackbox/testdata-apple/apple-multiconfig/helpers.js b/tests/auto/blackbox/testdata-apple/apple-multiconfig/helpers.js index 16ba00fa9..5d1c0f273 100644 --- a/tests/auto/blackbox/testdata-apple/apple-multiconfig/helpers.js +++ b/tests/auto/blackbox/testdata-apple/apple-multiconfig/helpers.js @@ -36,12 +36,16 @@ var Utilities = require("qbs.Utilities"); function enableOldArch(qbs, xcodeVersion) { return qbs.targetOS.contains("macos") && xcodeVersion - && Utilities.versionCompare(xcodeVersion, "10") < 0 + && (Utilities.versionCompare(xcodeVersion, "10") < 0 + || Utilities.versionCompare(xcodeVersion, "12.2") >= 0) || qbs.targetOS.contains("ios") } -function getNewArch(qbs) { - if (qbs.targetOS.contains("macos") || qbs.targetOS.contains("ios-simulator")) +function getNewArch(qbs, xcodeVersion) { + if (qbs.targetOS.contains("macos")) + return xcodeVersion + && Utilities.versionCompare(xcodeVersion, "12.2") >= 0 ? "arm64" : "x86_64"; + else if (qbs.targetOS.contains("ios-simulator")) return "x86_64" else if (qbs.targetOS.contains("ios")) return "arm64" @@ -52,8 +56,11 @@ function getNewArch(qbs) { throw "unsupported targetOS: " + qbs.targetOS; } -function getOldArch(qbs) { - if (qbs.targetOS.contains("macos") || qbs.targetOS.contains("ios-simulator")) +function getOldArch(qbs, xcodeVersion) { + if (qbs.targetOS.contains("macos")) + return xcodeVersion + && Utilities.versionCompare(xcodeVersion, "12.2") >= 0 ? "x86_64" : "x86"; + else if (qbs.targetOS.contains("ios-simulator")) return "x86" else if (qbs.targetOS.contains("ios")) return "armv7a" @@ -62,6 +69,6 @@ function getOldArch(qbs) { function getArchitectures(qbs, xcodeVersion) { return enableOldArch(qbs, xcodeVersion) - ? [getOldArch(qbs), getNewArch(qbs)] - : [getNewArch(qbs)]; + ? [getOldArch(qbs, xcodeVersion), getNewArch(qbs, xcodeVersion)] + : [getNewArch(qbs, xcodeVersion)]; } |