1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Android: install android test scripts to libexec to test on all modules

Browse Source 
The scripts that are used by Android test VMs are now located in qtbase
and are not easily usable by other modules. To fix that and allow other
modules to use those scripts, we install them with cmake into libexec.

Task-number: QTQAINFRA-4052
Change-Id: Ibdd3658fd9fe7e007104a85d9999028a2de99a33
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit f3cfdb905b926948659f37924837b3c14868ff6a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Assam Boudjelthia 2020-12-11 16:38:39 +02:00 committed by Qt Cherry-pick Bot
parent 384864e3dd
commit 9b3e80cd87
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmake/QtWrapperScriptHelpers.cmake
View File

@ -125,6 +125,7 @@ function(qt_internal_create_wrapper_scripts)
DESTINATION "${INSTALL_BINDIR}")
qt_internal_create_qt_configure_tests_wrapper_script()
qt_internal_install_android_helper_scripts()
endfunction()
function(qt_internal_create_qt_configure_tests_wrapper_script)
@ -156,3 +157,11 @@ function(qt_internal_create_qt_configure_tests_wrapper_script)
qt_install(PROGRAMS "${QT_BUILD_DIR}/${INSTALL_BINDIR}/${script_name}"
DESTINATION "${INSTALL_BINDIR}")
endfunction()
function(qt_internal_install_android_helper_scripts)
qt_path_join(destination "${QT_INSTALL_DIR}" "${INSTALL_LIBEXECDIR}")
qt_copy_or_install(PROGRAMS "${CMAKE_CURRENT_SOURCE_DIR}/util/android/android_emulator_launcher.sh"
DESTINATION "${destination}")
qt_copy_or_install(PROGRAMS "${CMAKE_CURRENT_SOURCE_DIR}/util/android/android_cmakelist_patcher.sh"
DESTINATION "${destination}")
endfunction()

2
coin/instructions/call_cmake_for_standalone_tests.yaml
View File

@ -3,7 +3,7 @@ instructions:
- type: ChangeDirectory
directory: "{{.SourceDir}}"
- type: ExecuteCommand
command: "{{.SourceDir}}/util/android/android_cmakelist_patcher.sh"
command: "{{.InstallDir}}/libexec/android_cmakelist_patcher.sh"
maxTimeInSeconds: 6000
maxTimeBetweenOutput: 1200
userMessageOnFailure: >

2
coin/instructions/coin_module_test_android_start_emulator.yaml
View File

@ -3,7 +3,7 @@ instructions:
- type: Group
instructions:
- type: ExecuteCommand
command: "sh {{.SourceDir}}/util/android/android_emulator_launcher.sh"
command: "sh {{.InstallDir}}/libexec/android_emulator_launcher.sh"
maxTimeInSeconds: 300
maxTimeBetweenOutput: 300
userMessageOnFailure: "Failed to start emulator, check logs."