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.

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

Let CTest succeed on Windows by ignoring CR #111

Merged
merged 4 commits into from
Mar 9, 2024

Conversation

thbeu
Copy link
Contributor

@thbeu thbeu commented Mar 9, 2024

No description provided.

@rouault
Copy link
Member

rouault commented Mar 9, 2024

by "Let CTest succeed on Windows by ignoring CR " you mean on Windows with some cygwin-like environment? Because our CI windows-msvc build doesn't run any test

@thbeu
Copy link
Contributor Author

thbeu commented Mar 9, 2024

Well, with this PR I am finally able to run CTest in VS locally:

1>------ Erstellen gestartet: Projekt: ZERO_CHECK, Konfiguration: Debug x64 ------
1>Checking Build System
2>------ Erstellen gestartet: Projekt: RUN_TESTS, Konfiguration: Debug x64 ------
2>Test project C:/Projekte/shapelib/win64
2> Start 1: test1
2>1/4 Test # 1: test1 ............................ Passed 0.76 sec
2> Start 2: test2
2>2/4 Test # 2: test2 ............................ Passed 1.10 sec
2> Start 3: test3
2>3/4 Test # 3: test3 ............................ Passed 0.62 sec
2> Start 4: contrib
2>4/4 Test # 4: contrib .......................... Passed 0.67 sec
2>
2>100% tests passed, 0 tests failed out of 4
2>
2>Total Test time (real) = 3.16 sec
========== Erstellen: 2 erfolgreich, 0 fehlerhaft, 0 aktuell, 0 übersprungen ==========

We could also add -DBUILD_TESTING=ON to the CI, but for Windows I need to know where -DBASH_EXECUTABLE needs to be. I set it to C:/Program Files/Git/bin/bash.exe.

@thbeu
Copy link
Contributor Author

thbeu commented Mar 9, 2024

OK, all ✅ now.

@rouault
Copy link
Member

rouault commented Mar 9, 2024

thanks for the windows CI improvement. Hopefully I'm not too demanding, but I'd like to be sure we don't regress on Windows with DLL builds. Couldn't we have both a dynamic and static build, and possibly only run the tests with the static one if that's more convenient?

@thbeu thbeu force-pushed the fix-diff-cmd branch 7 times, most recently from 074a643 to 49edaae Compare March 9, 2024 15:33
@thbeu
Copy link
Contributor Author

thbeu commented Mar 9, 2024

Uff, took longer than expected.

@rouault
Copy link
Member

rouault commented Mar 9, 2024

Thanks, perfect!

@rouault rouault merged commit 71a6552 into OSGeo:master Mar 9, 2024
5 checks passed
@thbeu thbeu deleted the fix-diff-cmd branch March 9, 2024 15:48
@landryb
Copy link

landryb commented Aug 13, 2024

fwiw, this add --strip-trailing-cr thing makes all test break on BSD, because that option is a gnu diff extension.

@thbeu
Copy link
Contributor Author

thbeu commented Aug 13, 2024

fwiw, this add --strip-trailing-cr thing makes all test break on BSD, because that option is a gnu diff extension.

Addressed by #152.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants