summaryrefslogtreecommitdiffstats
path: root/coin/instructions/cmake_run_ctest_enforce_exit_code.yaml
diff options
context:
space:
mode:
Diffstat (limited to 'coin/instructions/cmake_run_ctest_enforce_exit_code.yaml')
-rw-r--r--coin/instructions/cmake_run_ctest_enforce_exit_code.yaml17
1 files changed, 6 insertions, 11 deletions
diff --git a/coin/instructions/cmake_run_ctest_enforce_exit_code.yaml b/coin/instructions/cmake_run_ctest_enforce_exit_code.yaml
index fecf283905..c2560be37e 100644
--- a/coin/instructions/cmake_run_ctest_enforce_exit_code.yaml
+++ b/coin/instructions/cmake_run_ctest_enforce_exit_code.yaml
@@ -10,19 +10,14 @@ instructions:
equals_value: Windows
- type: EnvironmentVariable
variableName: TESTRUNNER
- variableValue: "python3 {{.SourceDir}}/coin_ctest_runner.py"
+ variableValue: "{{.InstallDir}}/libexec/qt-testrunner.py --"
disable_if:
- condition: or
- conditions:
- - condition: property
- property: host.os
- equals_value: Windows
- - condition: property
- property: features
- contains_value: AndroidTestRun
+ condition: property
+ property: host.os
+ equals_value: Windows
- type: EnvironmentVariable
variableName: TESTRUNNER
- variableValue: "{{.SourceDir}}\\coin_ctest_runner.py"
+ variableValue: "{{.InstallDir}}\\bin\\qt-testrunner.py --"
enable_if:
condition: property
property: host.os
@@ -43,7 +38,7 @@ instructions:
equals_value: Windows
- type: EnvironmentVariable
variableName: CTEST_ARGS
- variableValue: "-V --rerun-failed --force-new-ctest-process --repeat until-pass:5"
+ variableValue: "-V"
- type: AppendToEnvironmentVariable
variableName: CTEST_ARGS
variableValue: " --stop-on-failure"