Skip to content

Commit

Permalink
Fix diff command to only set --strip-trailing-cr if available (#152)
Browse files Browse the repository at this point in the history
  • Loading branch information
thbeu authored Aug 13, 2024
1 parent 4418961 commit bcd39fc
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
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

0 comments on commit bcd39fc

Please sign in to comment.