Skip to content

Commit

Permalink
Merge pull request #1706 from kerautret/CtestWindows
Browse files Browse the repository at this point in the history
Activate Ctest on windows
  • Loading branch information
dcoeurjo authored Oct 25, 2023
2 parents d8e248d + 94dc81a commit f845833
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 1 deletion.
8 changes: 8 additions & 0 deletions .github/workflows/build-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,14 @@ jobs:
echo ctest -C ${{ matrix.BUILD_TYPE }} --output-on-failure -E $TESTBLACKLIST
ctest -C $${{ matrix.BUILD_TYPE }} --output-on-failure -E $TESTBLACKLIST
- name: Test
working-directory: ${{runner.workspace}}/build
if: matrix.os == 'windows-latest'
shell: bash
run: |
echo ctest -C ${{ matrix.BUILD_TYPE }} --output-on-failure -E $TESTBLACKLIST
ctest -C ${{ matrix.BUILD_TYPE }} --output-on-failure -E $TESTBLACKLIST
- name: DGtalTools (linux only, we check this PR against DGtalTools master)
if: matrix.os == 'ubuntu-latest'
Expand Down
8 changes: 8 additions & 0 deletions .github/workflows/buildAndDocumentation-PR.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,14 @@ jobs:
echo ctest -C ${{ matrix.BUILD_TYPE }} --output-on-failure -E $TESTBLACKLIST
ctest -C $${{ matrix.BUILD_TYPE }} --output-on-failure -E $TESTBLACKLIST
- name: Test
working-directory: ${{runner.workspace}}/build
if: matrix.os == 'windows-latest'
shell: bash
run: |
echo ctest -C ${{ matrix.BUILD_TYPE }} --output-on-failure -E $TESTBLACKLIST
ctest -C ${{ matrix.BUILD_TYPE }} --output-on-failure -E $TESTBLACKLIST
- name: DGtalTools (linux only, we check this PR against DGtalTools master)
if: matrix.os == 'ubuntu-latest'
Expand Down
2 changes: 2 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@

## Bug fixes
- *General*
- Activate and fix CTest tests on windows system. (Bertrand Kerautret,
[#1706](https://github.com/DGtal-team/DGtal/pull/1706))
- For now, removing Cairo deps install on windows (6hours long build
with conan in the windows debug mode). (David Coeurjolly,
[#1705](https://github.com/DGtal-team/DGtal/pull/1705))
Expand Down
2 changes: 1 addition & 1 deletion tests/TestFunctions.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ function(DGtal_add_test test_file) #optional_avoid_add_test
target_include_directories(${test_file} PRIVATE ${PROJECT_SOURCE_DIR}/tests/)
target_include_directories(${test_file} PRIVATE ${PROJECT_BINARY_DIR}/tests/)
if(NOT ${ARGC} GREATER 1)
add_test(${test_file} ${test_file})
add_test(NAME ${test_file} COMMAND ${test_file})
endif()
endif()
endfunction()

0 comments on commit f845833

Please sign in to comment.