diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2023-12-12 14:51:01 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-12-14 03:01:29 +0000 |
| commit | 5ebce47ac417c51e0a2a027eb873a91f1c703e16 (patch) | |
| tree | 4d67caaddaf67d4a0c65c40fe48647d2811794d2 /coin | |
| parent | aecf64eb7b896285d66b22fd725cb11e83f5e807 (diff) | |
CMake:Android:Coin: prioritize timeout from COIN_COMMAND_OUTPUT_TIMEOUT
... from CMake so that Coin doesn't end up killing the whole VM if aRows
test gets stuck and instead allow androidtestrunner to cleanup and fetch
the logs so we know what happened, and even potentially ending up re-run
the test and succeeding if it was flaky.
Also, since CMake sets the timeout during configuration time, coin needs
to set COIN_COMMAND_OUTPUT_TIMEOUT under the build target where tests
are configured, so this moves the setting of that env var from the test
target to the build target.
Pick-to: 6.6 6.5
Change-Id: I9883ea1e98c93f79a088067518d09ca8acd5fdfd
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 3ee2ecd6bfdf3320e66628afa5d017783df2ee91)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'coin')
| -rw-r--r-- | coin/instructions/cmake_run_ctest_enforce_exit_code.yaml | 15 | ||||
| -rw-r--r-- | coin/instructions/prepare_building_env.yaml | 15 |
2 files changed, 15 insertions, 15 deletions
diff --git a/coin/instructions/cmake_run_ctest_enforce_exit_code.yaml b/coin/instructions/cmake_run_ctest_enforce_exit_code.yaml index 68bbed6173..8551cbbda2 100644 --- a/coin/instructions/cmake_run_ctest_enforce_exit_code.yaml +++ b/coin/instructions/cmake_run_ctest_enforce_exit_code.yaml @@ -85,21 +85,6 @@ instructions: - !include "{{qt/qtbase}}/coin_module_test_android_start_emulator.yaml" - - type: EnvironmentVariable - variableName: COIN_COMMAND_OUTPUT_TIMEOUT - variableValue: "900" - disable_if: - condition: property - property: features - contains_value: UseAddressSanitizer - - type: EnvironmentVariable - variableName: COIN_COMMAND_OUTPUT_TIMEOUT - variableValue: "10800" - enable_if: - condition: property - property: features - contains_value: UseAddressSanitizer - - type: ExecuteCommand command: "{{.Env.TESTS_ENV_PREFIX}} ctest {{.Env.CTEST_ARGS}}" executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution diff --git a/coin/instructions/prepare_building_env.yaml b/coin/instructions/prepare_building_env.yaml index efeaa3d721..b689eb34c7 100644 --- a/coin/instructions/prepare_building_env.yaml +++ b/coin/instructions/prepare_building_env.yaml @@ -608,3 +608,18 @@ instructions: condition: property property: host.os equals_value: Windows + + - type: EnvironmentVariable + variableName: COIN_COMMAND_OUTPUT_TIMEOUT + variableValue: "900" + disable_if: + condition: property + property: features + contains_value: UseAddressSanitizer + - type: EnvironmentVariable + variableName: COIN_COMMAND_OUTPUT_TIMEOUT + variableValue: "10800" + enable_if: + condition: property + property: features + contains_value: UseAddressSanitizer |