diff --git a/test/asm/test.sh b/test/asm/test.sh index 33edcd2054..46a8e4a0be 100755 --- a/test/asm/test.sh +++ b/test/asm/test.sh @@ -30,7 +30,7 @@ RGBASM=../../rgbasm RGBLINK=../../rgblink tryDiff () { - if ! diff -u --strip-trailing-cr "$1" "$2"; then + if ! diff -au "$1" "$2"; then echo "${bold}${red}${i%.asm}${variant}.$3 mismatch!${rescolors}${resbold}" false fi diff --git a/test/fix/test.sh b/test/fix/test.sh index 360ef7585f..1c13d497ec 100755 --- a/test/fix/test.sh +++ b/test/fix/test.sh @@ -25,7 +25,7 @@ rescolors="$(tput op)" RGBFIX=./rgbfix tryDiff () { - if ! diff -u --strip-trailing-cr "$1" "$2"; then + if ! diff -au "$1" "$2"; then echo "${bold}${red}${3:-$1} mismatch!${rescolors}${resbold}" false fi diff --git a/test/gfx/test.sh b/test/gfx/test.sh index 3b54f03430..71d65e6c8d 100755 --- a/test/gfx/test.sh +++ b/test/gfx/test.sh @@ -83,7 +83,7 @@ for f in *.png; do newTest "$RGBGFX" $flags "$f" if [[ -e "${f%.png}.err" ]]; then runTest 2>"$errtmp" - diff -u --strip-trailing-cr "${f%.png}.err" "$errtmp" || failTest + diff -au "${f%.png}.err" "$errtmp" || failTest else runTest && checkOutput "${f%.png}" || failTest $? fi @@ -91,7 +91,7 @@ for f in *.png; do newTest "$RGBGFX" $flags - "<$f" if [[ -e "${f%.png}.err" ]]; then runTest 2>"$errtmp" - diff -u --strip-trailing-cr <(sed "s/$f//g" "${f%.png}.err") "$errtmp" || failTest + diff -au <(sed "s/$f//g" "${f%.png}.err") "$errtmp" || failTest else runTest && checkOutput "${f%.png}" || failTest $? fi diff --git a/test/link/test.sh b/test/link/test.sh index 4e3a07f94e..4a56c00973 100755 --- a/test/link/test.sh +++ b/test/link/test.sh @@ -38,7 +38,7 @@ continueTest () { } tryDiff () { - if ! diff -u --strip-trailing-cr "$1" "$2"; then + if ! diff -au "$1" "$2"; then echo "${bold}${red}$1 mismatch!${rescolors}${resbold}" false fi