COIN/Android: Move android_emulator_launcher.sh to qt5.git

The android emulator launcher script is mainly used in CI and thus makes sense to be moved there. This also makes it easier to make changes without having to wait for submodule updates. ANDROID_EMULATOR_RUNNER is defined in qt5's Android provisioning script. Also, change the order of instructions execution to set COIN_CTEST_RESULTSDIR env variable before running the emulator script. That var points to the path to where the emulator logs are saved. Task-number: QTQAINFRA-5596 Change-Id: If6ac285fecdc49611c398e8185e6e3e6b9c353fb Reviewed-by: Alexandru Croitor <[email protected]>
qt · Jul 25, 2023 · abe7c77 · abe7c77
1 parent 27b06e5
commit abe7c77
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 116 deletions.
diff --git a/cmake/QtWrapperScriptHelpers.cmake b/cmake/QtWrapperScriptHelpers.cmake
@@ -208,7 +208,6 @@ function(qt_internal_create_wrapper_scripts)
                DESTINATION "${INSTALL_LIBEXECDIR}")
 
     qt_internal_create_qt_configure_tests_wrapper_script()
-    qt_internal_install_android_helper_scripts()
 endfunction()
 
 function(qt_internal_create_qt_configure_tests_wrapper_script)
@@ -256,9 +255,3 @@ function(qt_internal_create_qt_configure_tests_wrapper_script)
                    DESTINATION "${INSTALL_BINDIR}")
     endif()
 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}")
-endfunction()
diff --git a/coin/instructions/cmake_run_ctest_enforce_exit_code.yaml b/coin/instructions/cmake_run_ctest_enforce_exit_code.yaml
@@ -61,6 +61,7 @@ instructions:
       condition: property
       property: features
       contains_value: AbortTestingOnFirstFailure
+  - !include "{{qt/qtbase}}/coin_module_test_android_start_emulator.yaml"
   - type: ExecuteCommand
     command: "{{.Env.TESTS_ENV_PREFIX}} ctest {{.Env.CTEST_ARGS}}"
     executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution

diff --git a/coin/instructions/coin_module_test_android_start_emulator.yaml b/coin/instructions/coin_module_test_android_start_emulator.yaml
@@ -3,10 +3,10 @@ instructions:
   - type: Group
     instructions:
       - type: ExecuteCommand
-        command: "{{.Env.LIBEXEC_INSTALL_DIR}}/android_emulator_launcher.sh"
+        command: "{{.Env.ANDROID_EMULATOR_RUNNER}}"
         maxTimeInSeconds: 600
         maxTimeBetweenOutput: 300
-        userMessageOnFailure: "Failed to start emulator, check coin log and ~/emulator.log"
+        userMessageOnFailure: "Failed to start emulator, check coin log and testresults log files."
     enable_if:
       condition: property
       property: features

diff --git a/coin/instructions/coin_module_test_template_common.yaml b/coin/instructions/coin_module_test_template_common.yaml
@@ -2,7 +2,6 @@ type: Group
 instructions:
   # The build env is needed on MSVC so that tst_qmake can properly build apps / libraries.
   - !include "{{qt/qtbase}}/prepare_building_env.yaml"
-  - !include "{{qt/qtbase}}/coin_module_test_android_start_emulator.yaml"
   - !include "{{qt/qtbase}}/coin_module_test_qnx_start_emulator.yaml"
   # The test env vars are needed to pick the proper prefix.bat file.
   - !include "{{qt/qtbase}}/cmake_setup_running_tests_env_vars.yaml"

diff --git a/util/android/android_emulator_launcher.sh b/util/android/android_emulator_launcher.sh