summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--coin/instructions/cmake_build_and_upload_test_artifacts.yaml4
-rw-r--r--coin/instructions/cmake_regular_test_instructions.yaml8
2 files changed, 5 insertions, 7 deletions
diff --git a/coin/instructions/cmake_build_and_upload_test_artifacts.yaml b/coin/instructions/cmake_build_and_upload_test_artifacts.yaml
index c818d60373..b6e5dc9902 100644
--- a/coin/instructions/cmake_build_and_upload_test_artifacts.yaml
+++ b/coin/instructions/cmake_build_and_upload_test_artifacts.yaml
@@ -3,9 +3,9 @@ instructions:
- type: ChangeDirectory
directory: "{{.SourceDir}}"
- type: MakeDirectory
- directory: "standalone_tests"
+ directory: "{{.SourceDir}}_standalone_tests"
- type: SetBuildDirectory
- directory: "{{.SourceDir}}/standalone_tests"
+ directory: "{{.SourceDir}}_standalone_tests"
- type: ChangeDirectory
directory: "{{.BuildDir}}"
- type: EnvironmentVariable
diff --git a/coin/instructions/cmake_regular_test_instructions.yaml b/coin/instructions/cmake_regular_test_instructions.yaml
index 6974b293dd..46123dcf96 100644
--- a/coin/instructions/cmake_regular_test_instructions.yaml
+++ b/coin/instructions/cmake_regular_test_instructions.yaml
@@ -1,18 +1,16 @@
type: Group
instructions:
- - type: ChangeDirectory
- directory: "{{.SourceDir}}"
- type: MakeDirectory
- directory: "standalone_tests"
+ directory: "{{.SourceDir}}_standalone_tests"
- type: InstallTestBinaryArchive
relativeStoragePath: "{{.Env.MODULE_ARTIFACTS_RELATIVE_STORAGE_PATH}}/tests.tar.gz"
- directory: "{{.SourceDir}}/standalone_tests"
+ directory: "{{.SourceDir}}_standalone_tests"
maxTimeInSeconds: 1200
maxTimeBetweenOutput: 1200
userMessageOnFailure: >
Failed to install tests archive.
- type: ChangeDirectory
- directory: "{{.SourceDir}}/standalone_tests"
+ directory: "{{.SourceDir}}_standalone_tests"
- type: ExecuteCommand
command: "ctest -V --rerun-failed"
ignoreExitCode: true