From 88cb10c41ce7c6a00487e9f3b1993dcf9aecd640 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Thu, 18 Feb 2021 13:29:00 +0200 Subject: Coin: remove workarounds to allow running Android tests We had two workarounds: * script that adds Gui to tests * create a symbolic link for the qt install dir to fake_prefix which androiddelployqt was expecting them to be under Both issues are fixed, thus removing the workarounds. Change-Id: Ic022bece15afe92c693d573893d260b13b4227ed Reviewed-by: Heikki Halmet (cherry picked from commit bcbdbd50fefd90cc8cfe2c01d8f681dfe690971a) Reviewed-by: Qt Cherry-pick Bot --- coin/instructions/call_cmake_for_standalone_tests.yaml | 12 ------------ .../instructions/cmake_regular_test_instructions_common.yaml | 10 ---------- 2 files changed, 22 deletions(-) (limited to 'coin/instructions') diff --git a/coin/instructions/call_cmake_for_standalone_tests.yaml b/coin/instructions/call_cmake_for_standalone_tests.yaml index cdbec9f107..7b78eee8c8 100644 --- a/coin/instructions/call_cmake_for_standalone_tests.yaml +++ b/coin/instructions/call_cmake_for_standalone_tests.yaml @@ -1,17 +1,5 @@ type: Group instructions: - - type: ChangeDirectory - directory: "{{.SourceDir}}" - - type: ExecuteCommand - command: "{{.InstallDir}}/libexec/android_cmakelist_patcher.sh" - maxTimeInSeconds: 6000 - maxTimeBetweenOutput: 1200 - userMessageOnFailure: > - Failed to patch CMakeLists.txt. - enable_if: - condition: property - property: features - contains_value: AndroidTestRun - type: ChangeDirectory directory: "{{.BuildDir}}" - type: ExecuteCommand diff --git a/coin/instructions/cmake_regular_test_instructions_common.yaml b/coin/instructions/cmake_regular_test_instructions_common.yaml index 3a9e75c576..ec6f23a3f7 100644 --- a/coin/instructions/cmake_regular_test_instructions_common.yaml +++ b/coin/instructions/cmake_regular_test_instructions_common.yaml @@ -11,13 +11,3 @@ instructions: Failed to install tests archive. - type: ChangeDirectory directory: "{{.SourceDir}}_standalone_tests" - - type: ExecuteCommand - command: "ln -s {{.InstallDir}}/target fake_prefix" - maxTimeInSeconds: 6000 - maxTimeBetweenOutput: 1200 - userMessageOnFailure: > - Failed to run android hack. See QTBUG-88579 to check if this can be removed - enable_if: - condition: property - property: features - contains_value: AndroidTestRun -- cgit v1.2.3