From f3cfdb905b926948659f37924837b3c14868ff6a Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Fri, 11 Dec 2020 16:38:39 +0200 Subject: 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 --- coin/instructions/call_cmake_for_standalone_tests.yaml | 2 +- coin/instructions/coin_module_test_android_start_emulator.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'coin') diff --git a/coin/instructions/call_cmake_for_standalone_tests.yaml b/coin/instructions/call_cmake_for_standalone_tests.yaml index 7ab936cf87..cdbec9f107 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 7fc034117c..57023b3a1f 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." -- cgit v1.2.3