From ee9fdd3603530b5e439e972f889a600f95942ef0 Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Fri, 27 Oct 2023 11:55:06 +0200 Subject: [PATCH] Increase Coin timeout for ctest command under sanitized testruns Reason is that after changing the sanitized testruns to quiet, we have been hitting the 15min output-inactivity timeout. Set it to the same value as the total workitem timeout, effectively disabling it. Change-Id: I13c2d97b25cf338873bb89ef1ed45d58e3cdd170 Reviewed-by: Toni Saario Reviewed-by: Dimitrios Apostolou (cherry picked from commit 333650c596890fb5117c3ab5c4295838600248f2) (cherry picked from commit 09f48964e0f4d8ee2491b4130627210c887913d8) Reviewed-by: Qt Cherry-pick Bot --- .../cmake_run_ctest_enforce_exit_code.yaml | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/coin/instructions/cmake_run_ctest_enforce_exit_code.yaml b/coin/instructions/cmake_run_ctest_enforce_exit_code.yaml index 79490d1c494..d9c8892573d 100644 --- a/coin/instructions/cmake_run_ctest_enforce_exit_code.yaml +++ b/coin/instructions/cmake_run_ctest_enforce_exit_code.yaml @@ -68,12 +68,28 @@ instructions: condition: property property: features contains_value: AbortTestingOnFirstFailure + + - 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 ignoreExitCode: false maxTimeInSeconds: 10800 - maxTimeBetweenOutput: 900 + maxTimeBetweenOutput: "{{.Env.COIN_COMMAND_OUTPUT_TIMEOUT}}" userMessageOnFailure: > Failed to run tests.