coin: Ignore exit code of LastTest.log copy if COIN_CTEST_IGNORE_EXIT_CODE
If COIN_CTEST_IGNORE_EXIT_CODE is in effect and ctest aborts for some reason (for example due to the workitem being cancelled) the ctest exit code will be ignored, as expected, but we will not have a LastTest.log to copy, which will fail the workitem unexpectedly. We now match the ignoreExitCode of the LastTest.log copy with the ctest run. Pick-to: 6.9 Change-Id: I9df0f863a42dd4cf25cee1694e85cb32058a4e5b Reviewed-by: Toni Saario <toni.saario@qt.io>
This commit is contained in:
parent
004a765d1f
commit
0e2067334d
@ -141,6 +141,16 @@ instructions:
|
|||||||
maxTimeBetweenOutput: 14400
|
maxTimeBetweenOutput: 14400
|
||||||
userMessageOnFailure: >
|
userMessageOnFailure: >
|
||||||
Failed to run tests.
|
Failed to run tests.
|
||||||
|
- type: ExecuteCommand
|
||||||
|
command: >
|
||||||
|
cmake -E copy
|
||||||
|
Testing{{.Env.CI_PATH_SEP}}Temporary{{.Env.CI_PATH_SEP}}LastTest.log
|
||||||
|
{{.Env.COIN_CTEST_RESULTSDIR}}{{.Env.CI_PATH_SEP}}CTest.log
|
||||||
|
executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
|
||||||
|
ignoreExitCode: false
|
||||||
|
userMessageOnFailure: >
|
||||||
|
Failed to copy LastTest.log to testresults directory.
|
||||||
|
executeOn: always
|
||||||
- type: Group
|
- type: Group
|
||||||
enable_if:
|
enable_if:
|
||||||
condition: runtime
|
condition: runtime
|
||||||
@ -155,16 +165,13 @@ instructions:
|
|||||||
maxTimeBetweenOutput: 14400
|
maxTimeBetweenOutput: 14400
|
||||||
userMessageOnFailure: >
|
userMessageOnFailure: >
|
||||||
Failed to run tests.
|
Failed to run tests.
|
||||||
|
|
||||||
- type: Group
|
|
||||||
instructions:
|
|
||||||
- type: ExecuteCommand
|
- type: ExecuteCommand
|
||||||
command: >
|
command: >
|
||||||
cmake -E copy
|
cmake -E copy
|
||||||
Testing{{.Env.CI_PATH_SEP}}Temporary{{.Env.CI_PATH_SEP}}LastTest.log
|
Testing{{.Env.CI_PATH_SEP}}Temporary{{.Env.CI_PATH_SEP}}LastTest.log
|
||||||
{{.Env.COIN_CTEST_RESULTSDIR}}{{.Env.CI_PATH_SEP}}CTest.log
|
{{.Env.COIN_CTEST_RESULTSDIR}}{{.Env.CI_PATH_SEP}}CTest.log
|
||||||
executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
|
executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
|
||||||
ignoreExitCode: false
|
ignoreExitCode: true
|
||||||
userMessageOnFailure: >
|
userMessageOnFailure: >
|
||||||
Failed to copy LastTest.log to testresults directory.
|
Failed to copy LastTest.log to testresults directory.
|
||||||
executeOn: always
|
executeOn: always
|
||||||
|
Loading…
x
Reference in New Issue
Block a user