diff options
| author | BogDan Vatra <bogdan@kde.org> | 2019-06-06 15:29:01 +0300 |
|---|---|---|
| committer | BogDan Vatra <bogdan@kdab.com> | 2019-06-13 07:26:20 +0000 |
| commit | 079dafc42fdfddbc6bff7d343463e16151afeb2d (patch) | |
| tree | 4a7a5bde9d30468c97cf7ef2bee5c1873f524354 /mkspecs | |
| parent | d73497cf770c92e38903850267fd8737df3578ca (diff) | |
Run prebuilt android test APKs
androidtestrunner now checks is the apk is build and if it is, it will skip the build phase.
Now we can build the apks in parallel (which takes most of the time) and run them sequentially.
This way running tests on Android is much faster.
Change-Id: I82f34723ac08f7728cc0daab3366e03821335eed
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/testcase.prf | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mkspecs/features/testcase.prf b/mkspecs/features/testcase.prf index bc1ee22701..d4f08835f1 100644 --- a/mkspecs/features/testcase.prf +++ b/mkspecs/features/testcase.prf @@ -54,6 +54,7 @@ debug_and_release:debug_and_release_target { # Allow for a custom test runner script android: isEmpty($(TESTRUNNER)) { + APK_PATH = $$shell_path($$OUT_PWD/android-build/$${TARGET}.apk) qtPrepareTool(ANDROIDTESTRUNNER, androidtestrunner) qtPrepareTool(ANDROIDDEPLOYQT, androiddeployqt) isEmpty(ANDROID_DEPLOYMENT_SETTINGS_FILE): ANDROID_DEPLOYMENT_SETTINGS_FILE = $$OUT_PWD/android-$$TARGET-deployment-settings.json @@ -62,6 +63,7 @@ android: isEmpty($(TESTRUNNER)) { $${type}.commands += --path \"$$OUT_PWD/android-build\" $${type}.commands += --adb \"$$shell_path($${ANDROID_SDK_ROOT}$${QMAKE_DIR_SEP}platform-tools$${QMAKE_DIR_SEP}adb$${extension})\" $${type}.commands += --make \"$(MAKE) -f $(MAKEFILE)\" + $${type}.commands += --apk $$APK_PATH } else: $${type}.commands += $(TESTRUNNER) unix { |