diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-02-18 13:29:00 +0200 |
|---|---|---|
| committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-02-18 13:42:19 +0200 |
| commit | bcbdbd50fefd90cc8cfe2c01d8f681dfe690971a (patch) | |
| tree | c8a5d26beafa21e5a3fe1eedda23d0b223437015 /coin | |
| parent | a2e23bca0f2b43a26e2e489f83cfe2e521da63b9 (diff) | |
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.
Pick-to: 6.1 6.0
Change-Id: Ic022bece15afe92c693d573893d260b13b4227ed
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Diffstat (limited to 'coin')
| -rw-r--r-- | coin/instructions/call_cmake_for_standalone_tests.yaml | 12 | ||||
| -rw-r--r-- | coin/instructions/cmake_regular_test_instructions_common.yaml | 10 |
2 files changed, 0 insertions, 22 deletions
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,18 +1,6 @@ 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 command: "{{.Env.TESTS_ENV_PREFIX}} {{.Env.INSTALL_DIR_FOR_CMAKE_TESTS}}\\bin\\qt-internal-configure-tests {{.Env.COIN_CMAKE_ARGS}}" 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 |