summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--coin/instructions/cmake_run_ctest_enforce_exit_code.yaml13
-rw-r--r--coin/instructions/cmake_run_ctest_ignore_exit_code.yaml13
2 files changed, 24 insertions, 2 deletions
diff --git a/coin/instructions/cmake_run_ctest_enforce_exit_code.yaml b/coin/instructions/cmake_run_ctest_enforce_exit_code.yaml
index dcab6f7861..9913bb4832 100644
--- a/coin/instructions/cmake_run_ctest_enforce_exit_code.yaml
+++ b/coin/instructions/cmake_run_ctest_enforce_exit_code.yaml
@@ -1,7 +1,18 @@
type: Group
instructions:
+ - type: EnvironmentVariable
+ variableName: CTEST_ARGS
+ variableValue: "-V --rerun-failed --force-new-ctest-process --repeat until-pass:5"
+ - type: AppendToEnvironmentVariable
+ variableName: CTEST_ARGS
+ variableValue: " --stop-on-failure"
+ enable_if:
+ condition: property
+ property: features
+ contains_value: AbortTestingOnFirstFailure
- type: ExecuteCommand
- command: "{{.Env.TESTS_ENV_PREFIX}} ctest -V --rerun-failed --force-new-ctest-process --repeat until-pass:5"
+ command: "{{.Env.TESTS_ENV_PREFIX}} ctest {{.Env.CTEST_ARGS}}"
+ executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
ignoreExitCode: false
maxTimeInSeconds: 7200
maxTimeBetweenOutput: 900
diff --git a/coin/instructions/cmake_run_ctest_ignore_exit_code.yaml b/coin/instructions/cmake_run_ctest_ignore_exit_code.yaml
index f2617ead68..d4f0c13e3f 100644
--- a/coin/instructions/cmake_run_ctest_ignore_exit_code.yaml
+++ b/coin/instructions/cmake_run_ctest_ignore_exit_code.yaml
@@ -1,7 +1,18 @@
type: Group
instructions:
+ - type: EnvironmentVariable
+ variableName: CTEST_ARGS
+ variableValue: "-V --rerun-failed --force-new-ctest-process"
+ - type: AppendToEnvironmentVariable
+ variableName: CTEST_ARGS
+ variableValue: " --stop-on-failure"
+ enable_if:
+ condition: property
+ property: features
+ contains_value: AbortTestingOnFirstFailure
- type: ExecuteCommand
- command: "{{.Env.TESTS_ENV_PREFIX}} ctest -V --rerun-failed --force-new-ctest-process"
+ command: "{{.Env.TESTS_ENV_PREFIX}} ctest {{.Env.CTEST_ARGS}}"
+ executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
ignoreExitCode: true
maxTimeInSeconds: 7200
maxTimeBetweenOutput: 900