Test scripts compare text files as text without stripping newlines

Consistently use LF line endings in expected .out and .err output
gbdev · Jan 28, 2025 · a895be5 · a895be5
1 parent 375adc6
commit a895be5
Show file tree

Hide file tree

Showing 31 changed files with 44 additions and 44 deletions.
diff --git a/test/asm/multiple-else.err b/test/asm/multiple-else.err
@@ -1,2 +1,2 @@
-FATAL: multiple-else.asm(11):
-    Found ELSE after an ELSE block
+FATAL: multiple-else.asm(11):
+    Found ELSE after an ELSE block
diff --git a/test/asm/narg-decreases-after-shift.err b/test/asm/narg-decreases-after-shift.err
@@ -1,2 +1,2 @@
-warning: narg-decreases-after-shift.asm(14) -> narg-decreases-after-shift.asm::testing(9): [-Wmacro-shift]
-    Cannot shift macro arguments past their end
+warning: narg-decreases-after-shift.asm(14) -> narg-decreases-after-shift.asm::testing(9): [-Wmacro-shift]
+    Cannot shift macro arguments past their end
diff --git a/test/asm/strrpl.err b/test/asm/strrpl.err
@@ -1,2 +1,2 @@
-warning: strrpl.asm(4): [-Wempty-strrpl]
-    STRRPL: Cannot replace an empty string
+warning: strrpl.asm(4): [-Wempty-strrpl]
+    STRRPL: Cannot replace an empty string
diff --git a/test/asm/symbol-invalid-macro-arg.out b/test/asm/symbol-invalid-macro-arg.out
@@ -1 +1 @@
-$A
+$A
diff --git 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/color.err b/test/fix/color.err
@@ -1 +1 @@
-warning: Overwrote a non-zero byte in the CGB flag
+warning: Overwrote a non-zero byte in the CGB flag
diff --git a/test/fix/compatible.err b/test/fix/compatible.err
@@ -1 +1 @@
-warning: Overwrote a non-zero byte in the CGB flag
+warning: Overwrote a non-zero byte in the CGB flag
diff --git a/test/fix/custom-logo.err b/test/fix/custom-logo.err
@@ -1 +1 @@
-warning: Overwrote a non-zero byte in the logo
+warning: Overwrote a non-zero byte in the logo
diff --git a/test/fix/gameid.err b/test/fix/gameid.err
@@ -1 +1 @@
-warning: Overwrote a non-zero byte in the manufacturer code
+warning: Overwrote a non-zero byte in the manufacturer code
diff --git a/test/fix/header-edit.err b/test/fix/header-edit.err
@@ -1,2 +1,2 @@
-warning: Overwrote a non-zero byte in the CGB flag
-warning: Overwrote a non-zero byte in the header checksum
+warning: Overwrote a non-zero byte in the CGB flag
+warning: Overwrote a non-zero byte in the header checksum
diff --git a/test/fix/header-trash.err b/test/fix/header-trash.err
@@ -1 +1 @@
-warning: Overwrote a non-zero byte in the header checksum
+warning: Overwrote a non-zero byte in the header checksum
diff --git a/test/fix/header.err b/test/fix/header.err
@@ -1 +1 @@
-warning: Overwrote a non-zero byte in the header checksum
+warning: Overwrote a non-zero byte in the header checksum
diff --git a/test/fix/jp.err b/test/fix/jp.err
@@ -1 +1 @@
-warning: Overwrote a non-zero byte in the destination code
+warning: Overwrote a non-zero byte in the destination code
diff --git a/test/fix/logo-trash.err b/test/fix/logo-trash.err
@@ -1 +1 @@
-warning: Overwrote a non-zero byte in the Nintendo logo
+warning: Overwrote a non-zero byte in the Nintendo logo
diff --git a/test/fix/logo.err b/test/fix/logo.err
@@ -1 +1 @@
-warning: Overwrote a non-zero byte in the Nintendo logo
+warning: Overwrote a non-zero byte in the Nintendo logo
diff --git a/test/fix/new-lic.err b/test/fix/new-lic.err
@@ -1 +1 @@
-warning: Overwrote a non-zero byte in the new licensee code
+warning: Overwrote a non-zero byte in the new licensee code
diff --git a/test/fix/old-lic-hex.err b/test/fix/old-lic-hex.err
@@ -1 +1 @@
-warning: Overwrote a non-zero byte in the old licensee code
+warning: Overwrote a non-zero byte in the old licensee code
diff --git a/test/fix/old-lic.err b/test/fix/old-lic.err
@@ -1 +1 @@
-warning: Overwrote a non-zero byte in the old licensee code
+warning: Overwrote a non-zero byte in the old licensee code
diff --git a/test/fix/ram.err b/test/fix/ram.err
@@ -1 +1 @@
-warning: Overwrote a non-zero byte in the RAM size
+warning: Overwrote a non-zero byte in the RAM size
diff --git a/test/fix/ramful-mbc.err b/test/fix/ramful-mbc.err
@@ -1,2 +1,2 @@
-warning: Overwrote a non-zero byte in the cartridge type
-warning: Overwrote a non-zero byte in the RAM size
+warning: Overwrote a non-zero byte in the cartridge type
+warning: Overwrote a non-zero byte in the RAM size
diff --git a/test/fix/ramless-mbc.err b/test/fix/ramless-mbc.err
@@ -1,2 +1,2 @@
-warning: Overwrote a non-zero byte in the cartridge type
-warning: Overwrote a non-zero byte in the RAM size
+warning: Overwrote a non-zero byte in the cartridge type
+warning: Overwrote a non-zero byte in the RAM size
diff --git a/test/fix/sgb.err b/test/fix/sgb.err
@@ -1 +1 @@
-warning: Overwrote a non-zero byte in the SGB flag
+warning: Overwrote a non-zero byte in the SGB flag
diff --git 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/fix/title-pad.err b/test/fix/title-pad.err
@@ -1 +1 @@
-warning: Overwrote a non-zero byte in the title
+warning: Overwrote a non-zero byte in the title
diff --git a/test/fix/title.err b/test/fix/title.err
@@ -1 +1 @@
-warning: Overwrote a non-zero byte in the title
+warning: Overwrote a non-zero byte in the title
diff --git a/test/fix/verify-pad.err b/test/fix/verify-pad.err
@@ -1,3 +1,3 @@
-warning: Overwrote a non-zero byte in the Nintendo logo
-warning: Overwrote a non-zero byte in the header checksum
-warning: Overwrote a non-zero byte in the global checksum
+warning: Overwrote a non-zero byte in the Nintendo logo
+warning: Overwrote a non-zero byte in the header checksum
+warning: Overwrote a non-zero byte in the global checksum
diff --git a/test/fix/verify-trash.err b/test/fix/verify-trash.err
@@ -1,3 +1,3 @@
-warning: Overwrote a non-zero byte in the Nintendo logo
-warning: Overwrote a non-zero byte in the header checksum
-warning: Overwrote a non-zero byte in the global checksum
+warning: Overwrote a non-zero byte in the Nintendo logo
+warning: Overwrote a non-zero byte in the header checksum
+warning: Overwrote a non-zero byte in the global checksum
diff --git a/test/fix/verify.err b/test/fix/verify.err
@@ -1,3 +1,3 @@
-warning: Overwrote a non-zero byte in the Nintendo logo
-warning: Overwrote a non-zero byte in the header checksum
-warning: Overwrote a non-zero byte in the global checksum
+warning: Overwrote a non-zero byte in the Nintendo logo
+warning: Overwrote a non-zero byte in the header checksum
+warning: Overwrote a non-zero byte in the global checksum
diff --git a/test/fix/version.err b/test/fix/version.err
@@ -1 +1 @@
-warning: Overwrote a non-zero byte in the mask ROM version number
+warning: Overwrote a non-zero byte in the mask ROM version number
diff --git a/test/gfx/test.sh b/test/gfx/test.sh
@@ -83,15 +83,15 @@ 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
 
 	newTest "$RGBGFX" $flags - "<$f"
 	if [[ -e "${f%.png}.err" ]]; then
 		runTest 2>"$errtmp"
-		diff -u --strip-trailing-cr <(sed "s/$f/<stdin>/g" "${f%.png}.err") "$errtmp" || failTest
+		diff -au <(sed "s/$f/<stdin>/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
@@ -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
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		warning: Overwrote a non-zero byte in the CGB flag
		warning: Overwrote a non-zero byte in the CGB flag