diff options
| author | Toni Saario <[email protected]> | 2024-10-04 16:12:01 +0300 |
|---|---|---|
| committer | Toni Saario <[email protected]> | 2024-10-10 15:23:32 +0300 |
| commit | 5f48395929bdad956af464979b0f8d83d96f4ad4 (patch) | |
| tree | 03542e046c573239b1a1aceaa2412c9e6aafe714 | |
| parent | 0806aee2bb355e54abcabe87a5fd97504f692ba9 (diff) | |
Coin: Disable test output timeout
Now that the ctest is not run as verbose the logging is significantly
decreased and VxWorks will hit timeout on some tests.
There are plenty of other timeouts that will be hit instead
before the total timeout specified for the command e.g.
- Ctest timeout 25min default per test case.
- Testlib timeout per test function 10min default.
Change-Id: Ic02e812d4b059609553d2ac8d44ec91f358d76c5
Reviewed-by: Tor Arne Vestbø <[email protected]>
Reviewed-by: Assam Boudjelthia <[email protected]>
| -rw-r--r-- | cmake/QtTestHelpers.cmake | 7 | ||||
| -rw-r--r-- | coin/instructions/cmake_run_ctest.yaml | 4 | ||||
| -rw-r--r-- | coin/instructions/prepare_building_env.yaml | 15 |
3 files changed, 3 insertions, 23 deletions
diff --git a/cmake/QtTestHelpers.cmake b/cmake/QtTestHelpers.cmake index 5bcbc60b598..7a0555e5ba0 100644 --- a/cmake/QtTestHelpers.cmake +++ b/cmake/QtTestHelpers.cmake @@ -883,12 +883,7 @@ endfunction() function(qt_internal_get_android_test_timeout input_timeout percentage output_timeout_var) set(actual_timeout "${input_timeout}") if(NOT actual_timeout) - # we have coin ci timeout set use that to avoid having the emulator killed - # so we can at least get some logs from the android test runner. - set(coin_timeout $ENV{COIN_COMMAND_OUTPUT_TIMEOUT}) - if(coin_timeout) - set(actual_timeout "${coin_timeout}") - elseif(DART_TESTING_TIMEOUT) + if(DART_TESTING_TIMEOUT) # Related: https://gitlab.kitware.com/cmake/cmake/-/issues/20450 set(actual_timeout "${DART_TESTING_TIMEOUT}") elseif(CTEST_TEST_TIMEOUT) diff --git a/coin/instructions/cmake_run_ctest.yaml b/coin/instructions/cmake_run_ctest.yaml index 4cef9b816dd..262a6faf74d 100644 --- a/coin/instructions/cmake_run_ctest.yaml +++ b/coin/instructions/cmake_run_ctest.yaml @@ -138,7 +138,7 @@ instructions: executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution ignoreExitCode: false maxTimeInSeconds: 14400 - maxTimeBetweenOutput: "{{.Env.COIN_COMMAND_OUTPUT_TIMEOUT}}" + maxTimeBetweenOutput: 14400 userMessageOnFailure: > Failed to run tests. - type: Group @@ -152,7 +152,7 @@ instructions: executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution ignoreExitCode: true maxTimeInSeconds: 14400 - maxTimeBetweenOutput: "{{.Env.COIN_COMMAND_OUTPUT_TIMEOUT}}" + maxTimeBetweenOutput: 14400 userMessageOnFailure: > Failed to run tests. diff --git a/coin/instructions/prepare_building_env.yaml b/coin/instructions/prepare_building_env.yaml index 50b0bb1d2fc..c479e0e426f 100644 --- a/coin/instructions/prepare_building_env.yaml +++ b/coin/instructions/prepare_building_env.yaml @@ -755,18 +755,3 @@ 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 |
