diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2019-10-24 10:50:06 +0200 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2019-10-28 09:18:28 +0000 |
| commit | 080f9ad160ef7422b2bab884c7ccc950d35b3a0a (patch) | |
| tree | 3c27a8b4f386e4e8e66a5bbf9141de4d200f7560 /cmake/QtPlatformAndroid.cmake | |
| parent | d183c21a2cde1b4d987e1f4497611b0fe586bdc1 (diff) | |
Enable running test on Android
This patch converts all add_executable calls when building for Android
to a module library and replaces the call to add_test() to use
the android testrunner binary.
Change-Id: I10ba5919217cdc93cc2cbbb7d13ad9d10fc5ac1a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake/QtPlatformAndroid.cmake')
| -rw-r--r-- | cmake/QtPlatformAndroid.cmake | 29 |
1 files changed, 28 insertions, 1 deletions
diff --git a/cmake/QtPlatformAndroid.cmake b/cmake/QtPlatformAndroid.cmake index 0a91e14591..4b5bf6ff13 100644 --- a/cmake/QtPlatformAndroid.cmake +++ b/cmake/QtPlatformAndroid.cmake @@ -332,7 +332,7 @@ function(qt_android_add_apk_target target) endif() set(deployment_tool "${QT_HOST_PATH}/bin/androiddeployqt") - set(apk_dir "$<TARGET_PROPERTY:${target},BINARY_DIR>/apk") + set(apk_dir "$<TARGET_PROPERTY:${target},BINARY_DIR>/android-build") add_custom_target(${target}_prepare_apk_dir DEPENDS ${target} COMMAND ${CMAKE_COMMAND} @@ -349,3 +349,30 @@ function(qt_android_add_apk_target target) COMMENT "Creating APK for ${target}" ) endfunction() + + +# Add a test for Android which will be run by the android test runner tool +function(qt_android_add_test target) + + set(deployment_tool "${QT_HOST_PATH}/bin/androiddeployqt") + set(test_runner "${QT_HOST_PATH}/bin/androidtestrunner") + + get_target_property(deployment_file ${target} QT_ANDROID_DEPLOYMENT_SETTINGS_FILE) + if (NOT deployment_file) + message(FATAL_ERROR "Target ${target} is not a valid android executable target\n") + endif() + + set(target_binary_dir "$<TARGET_PROPERTY:${target},BINARY_DIR>") + set(apk_dir "${target_binary_dir}/android-build") + + add_test(NAME "${target}" + COMMAND "${test_runner}" + --androiddeployqt "${deployment_tool} --input ${deployment_file}" + --adb "${ANDROID_SDK_ROOT}/platform-tools/adb" + --path "${apk_dir}" + --skip-install-root + --make "${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target ${target}_make_apk" + --apk "${apk_dir}/${target}.apk" + --verbose + ) +endfunction() |