diff options
author | Ivan Komissarov <abbapoh@gmail.com> | 2020-04-20 15:51:22 +0200 |
---|---|---|
committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2020-05-22 08:21:10 +0000 |
commit | 38bec94ff92bc117906906cfff9b2b08fc74dfab (patch) | |
tree | 3903fba3d8f2a700f2a593b836cd1d3425929c27 /tests/auto/blackbox/testdata/minimumSystemVersion/specific.qbs | |
parent | 92970c2cb233bc3c629250312761637ffb6d36b8 (diff) |
Fix or skip tests to be able to run with the iOS profile
This skips tests that are not possible to run without the device and
fixes other tests for the iOS profile.
Also, adds Travis job that runs tests using iOS profile.
This is the squashed merge commit of the wip/ci-ios branch.
Change-Id: Ia0c1fc05fdb8c6e269f5e66f979f2ae19465433c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'tests/auto/blackbox/testdata/minimumSystemVersion/specific.qbs')
-rw-r--r-- | tests/auto/blackbox/testdata/minimumSystemVersion/specific.qbs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/auto/blackbox/testdata/minimumSystemVersion/specific.qbs b/tests/auto/blackbox/testdata/minimumSystemVersion/specific.qbs index f6ecab418..8099d79b9 100644 --- a/tests/auto/blackbox/testdata/minimumSystemVersion/specific.qbs +++ b/tests/auto/blackbox/testdata/minimumSystemVersion/specific.qbs @@ -4,7 +4,12 @@ import qbs.Utilities // when the application is run its output should confirm // that the given values took effect CppApplication { - condition: qbs.targetOS.contains("windows") || qbs.targetOS.contains("macos") + condition: { + var result = qbs.targetPlatform === qbs.hostPlatform; + if (!result) + console.info("targetPlatform differs from hostPlatform"); + return result && qbs.targetOS.contains("windows") || qbs.targetOS.contains("macos"); + } files: [qbs.targetOS.contains("darwin") ? "main.mm" : "main.cpp"] consoleApplication: true |