diff options
Diffstat (limited to 'coin')
| -rw-r--r-- | coin/instructions/cmake_build_and_upload_test_artifacts.yaml | 23 | ||||
| -rw-r--r-- | coin/instructions/cmake_regular_test_instructions.yaml | 8 |
2 files changed, 15 insertions, 16 deletions
diff --git a/coin/instructions/cmake_build_and_upload_test_artifacts.yaml b/coin/instructions/cmake_build_and_upload_test_artifacts.yaml index 81b0f7773b..59a2f09f0d 100644 --- a/coin/instructions/cmake_build_and_upload_test_artifacts.yaml +++ b/coin/instructions/cmake_build_and_upload_test_artifacts.yaml @@ -1,21 +1,16 @@ type: Group instructions: - type: ChangeDirectory - directory: "{{.SourceDir}}/tests" - - type: EnvironmentVariable - variableName: COIN_CMAKE_ARGS - variableValue: "{{.SourceDir}}\\tests" - enable_if: - condition: property - property: host.os - equals_value: Windows + directory: "{{.SourceDir}}" + - type: MakeDirectory + directory: "standalone_tests" + - type: SetBuildDirectory + directory: "{{.SourceDir}}/standalone_tests" + - type: ChangeDirectory + directory: "{{.BuildDir}}" - type: EnvironmentVariable variableName: COIN_CMAKE_ARGS - variableValue: "{{.SourceDir}}/tests" - disable_if: - condition: property - property: host.os - equals_value: Windows + variableValue: "-DQT_BUILD_STANDALONE_TESTS=ON -S {{.SourceDir}} -B ." - !include "{{qt/qtbase}}/call_cmake.yaml" - type: ExecuteCommand command: "{{.Env.ENV_PREFIX}} cmake --build . --parallel" @@ -25,7 +20,7 @@ instructions: Failed to build sources. In the current state bug can be everywhere. Contact Liang first. - type: UploadTestArtifact transferType: UploadModuleTestsArtifact - archiveDirectory: "{{.SourceDir}}/tests" + archiveDirectory: "{{.BuildDir}}" maxTimeInSeconds: 1200 maxTimeBetweenOutput: 1200 disable_if: diff --git a/coin/instructions/cmake_regular_test_instructions.yaml b/coin/instructions/cmake_regular_test_instructions.yaml index 10a8d6fbff..6974b293dd 100644 --- a/coin/instructions/cmake_regular_test_instructions.yaml +++ b/coin/instructions/cmake_regular_test_instructions.yaml @@ -1,14 +1,18 @@ type: Group instructions: + - type: ChangeDirectory + directory: "{{.SourceDir}}" + - type: MakeDirectory + directory: "standalone_tests" - type: InstallTestBinaryArchive relativeStoragePath: "{{.Env.MODULE_ARTIFACTS_RELATIVE_STORAGE_PATH}}/tests.tar.gz" - directory: "{{.SourceDir}}/tests" + directory: "{{.SourceDir}}/standalone_tests" maxTimeInSeconds: 1200 maxTimeBetweenOutput: 1200 userMessageOnFailure: > Failed to install tests archive. - type: ChangeDirectory - directory: "{{.SourceDir}}/tests" + directory: "{{.SourceDir}}/standalone_tests" - type: ExecuteCommand command: "ctest -V --rerun-failed" ignoreExitCode: true |