From f3cfdb905b926948659f37924837b3c14868ff6a Mon Sep 17 00:00:00 2001
From: Assam Boudjelthia <assam.boudjelthia@qt.io>
Date: Fri, 11 Dec 2020 16:38:39 +0200
Subject: [PATCH] Android: install android test scripts to libexec to test on
 all modules

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
Pick-to: 6.0
Change-Id: Ibdd3658fd9fe7e007104a85d9999028a2de99a33
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 cmake/QtWrapperScriptHelpers.cmake                       | 9 +++++++++
 coin/instructions/call_cmake_for_standalone_tests.yaml   | 2 +-
 .../coin_module_test_android_start_emulator.yaml         | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/cmake/QtWrapperScriptHelpers.cmake b/cmake/QtWrapperScriptHelpers.cmake
index 803ed676ade..3f8fbca54f8 100644
--- a/cmake/QtWrapperScriptHelpers.cmake
+++ b/cmake/QtWrapperScriptHelpers.cmake
@@ -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()
diff --git a/coin/instructions/call_cmake_for_standalone_tests.yaml b/coin/instructions/call_cmake_for_standalone_tests.yaml
index 7ab936cf87d..cdbec9f107a 100644
--- a/coin/instructions/call_cmake_for_standalone_tests.yaml
+++ b/coin/instructions/call_cmake_for_standalone_tests.yaml
@@ -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: >
diff --git a/coin/instructions/coin_module_test_android_start_emulator.yaml b/coin/instructions/coin_module_test_android_start_emulator.yaml
index 7fc034117cd..57023b3a1fc 100644
--- a/coin/instructions/coin_module_test_android_start_emulator.yaml
+++ b/coin/instructions/coin_module_test_android_start_emulator.yaml
@@ -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."