Skip to content

Fix diff command to only set --strip-trailing-cr if available #152

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

Merged
rouault merged 2 commits into from
Aug 13, 2024
Merged

Fix diff command to only set --strip-trailing-cr if available #152

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f512a23
Fix diff command to only set --strip-trailing-cr on Win
thbeu Aug 13, 2024
d3d8de3
Check if diff supports the --strip-trailing-cr option
thbeu Aug 13, 2024
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
15 changes: 13 additions & 2 deletions contrib/tests/shpproj.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,19 @@ readonly SCRIPTDIR=$(dirname "$0")

"${SHPDUMP:-$top_builddir/shpdump}" -precision 8 "test" > "test.out"


if result=$(diff --strip-trailing-cr "$SCRIPTDIR/expect.out" "test.out"); then
supports_strip_trailing_cr() {
diff --help 2>/dev/null | grep -q -- '--strip-trailing-cr'
}

run_diff() {
if supports_strip_trailing_cr; then
diff --strip-trailing-cr "$SCRIPTDIR/expect.out" "test.out"
else
diff "$SCRIPTDIR/expect.out" "test.out"
fi
}

if result=$(run_diff); then
echo "******* Test Succeeded *********"
exit 0
else
Expand Down