aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorRaphael Cotty <raphael.cotty@gmail.com>2021-03-31 22:36:16 +0200
committerRaphaƫl Cotty <raphael.cotty@gmail.com>2021-09-30 20:48:55 +0000
commit3318df5ffe2b67ee67efff02259c51a9cc21a253 (patch)
treec5c8dc0ff60a6cb536a266ed2c25d44367df145d /tests
parent8a2fbcf80de30a464977460f58a1d58187513fc5 (diff)
Add android testing with different ndk versions
New docker images are added to test different android ndks. Those images don't have Qt so only a subset of the tests are run. So far I added 3 images: r23 (LTS), r21e (LTS) and r19c (minimum one). The other android images also have a new ANDROID_NDK_VERSION argument set to the r23. Change-Id: Iaa7c80b9cac1c7888b3297fac13333d22a9ad0bc Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/blackbox/tst_blackboxandroid.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/blackbox/tst_blackboxandroid.cpp b/tests/auto/blackbox/tst_blackboxandroid.cpp
index ba864ed78..0d66f60bb 100644
--- a/tests/auto/blackbox/tst_blackboxandroid.cpp
+++ b/tests/auto/blackbox/tst_blackboxandroid.cpp
@@ -93,7 +93,7 @@ void TestBlackboxAndroid::android()
const SettingsPtr s = settings();
Profile p(theProfileName(projectDir == "qml-app" || projectDir == "qt-app"), s.get());
if (!p.exists())
- p = Profile("none", s.get());
+ QSKIP("Qt is not installed");
int status;
const auto androidPaths = findAndroid(&status, p.name());
QCOMPARE(status, 0);