Skip to content

Commit

Permalink
Fix diff command to only set --strip-trailing-cr on Win
Browse files Browse the repository at this point in the history
  • Loading branch information
thbeu committed Aug 13, 2024
1 parent 4418961 commit f512a23
Showing 1 changed file with 13 additions and 2 deletions.
15 changes: 13 additions & 2 deletions contrib/tests/shpproj.sh
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
is_windows() {
[ -n "$WINDIR" ] || uname | grep -q "MINGW"
}

run_diff() {
if is_windows; 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

0 comments on commit f512a23

Please sign in to comment.