Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Activate Ctest on windows #1706

Merged
merged 2 commits into from
Oct 25, 2023
Merged

Activate Ctest on windows #1706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dcb294c
Fix Ctest in windows configuration
kerautret Oct 23, 2023
94dc81a
build on PR and master and changelog
kerautret Oct 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .github/workflows/build-master.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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()