gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-20 18:22:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Consistently use LF line endings in expected .out and .err output (#1635)

Browse Source 
Test scripts compare files as text
This commit is contained in:
Rangi
2025-01-28 21:24:40 -05:00
committed by GitHub
parent 375adc6804
commit a59867cd78
31 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/asm/multiple-else.err
View File

@@ -1,2 +1,2 @@
FATAL: multiple-else.asm(11): FATAL: multiple-else.asm(11):
Found ELSE after an ELSE block Found ELSE after an ELSE block

4
test/asm/narg-decreases-after-shift.err
View File

@@ -1,2 +1,2 @@
warning: narg-decreases-after-shift.asm(14) -> narg-decreases-after-shift.asm::testing(9): [-Wmacro-shift] warning: narg-decreases-after-shift.asm(14) -> narg-decreases-after-shift.asm::testing(9): [-Wmacro-shift]
Cannot shift macro arguments past their end Cannot shift macro arguments past their end

4
test/asm/strrpl.err
View File

@@ -1,2 +1,2 @@
warning: strrpl.asm(4): [-Wempty-strrpl] warning: strrpl.asm(4): [-Wempty-strrpl]
STRRPL: Cannot replace an empty string STRRPL: Cannot replace an empty string

2
test/asm/symbol-invalid-macro-arg.out
View File

@@ -1 +1 @@
$A $A

2
test/asm/test.sh
View File

@@ -30,7 +30,7 @@ RGBASM=../../rgbasm
RGBLINK=../../rgblink RGBLINK=../../rgblink
tryDiff () { tryDiff () {
if ! diff -u --strip-trailing-cr "$1" "$2"; then if ! diff -au --strip-trailing-cr "$1" "$2"; then
echo "${bold}${red}${i%.asm}${variant}.$3 mismatch!${rescolors}${resbold}" echo "${bold}${red}${i%.asm}${variant}.$3 mismatch!${rescolors}${resbold}"
false false
fi fi

2
test/fix/color.err
View File

@@ -1 +1 @@
warning: Overwrote a non-zero byte in the CGB flag warning: Overwrote a non-zero byte in the CGB flag

2
test/fix/compatible.err
View File

@@ -1 +1 @@
warning: Overwrote a non-zero byte in the CGB flag warning: Overwrote a non-zero byte in the CGB flag

2
test/fix/custom-logo.err
View File

@@ -1 +1 @@
warning: Overwrote a non-zero byte in the logo warning: Overwrote a non-zero byte in the logo

2
test/fix/gameid.err
View File

@@ -1 +1 @@
warning: Overwrote a non-zero byte in the manufacturer code warning: Overwrote a non-zero byte in the manufacturer code

4
test/fix/header-edit.err
View File

@@ -1,2 +1,2 @@
warning: Overwrote a non-zero byte in the CGB flag 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 header checksum

2
test/fix/header-trash.err
View File

@@ -1 +1 @@
warning: Overwrote a non-zero byte in the header checksum warning: Overwrote a non-zero byte in the header checksum

2
test/fix/header.err
View File

@@ -1 +1 @@
warning: Overwrote a non-zero byte in the header checksum warning: Overwrote a non-zero byte in the header checksum

2
test/fix/jp.err
View File

@@ -1 +1 @@
warning: Overwrote a non-zero byte in the destination code warning: Overwrote a non-zero byte in the destination code

2
test/fix/logo-trash.err
View File

@@ -1 +1 @@
warning: Overwrote a non-zero byte in the Nintendo logo warning: Overwrote a non-zero byte in the Nintendo logo

2
test/fix/logo.err
View File

@@ -1 +1 @@
warning: Overwrote a non-zero byte in the Nintendo logo warning: Overwrote a non-zero byte in the Nintendo logo

2
test/fix/new-lic.err
View File

@@ -1 +1 @@
warning: Overwrote a non-zero byte in the new licensee code warning: Overwrote a non-zero byte in the new licensee code

2
test/fix/old-lic-hex.err
View File

@@ -1 +1 @@
warning: Overwrote a non-zero byte in the old licensee code warning: Overwrote a non-zero byte in the old licensee code

2
test/fix/old-lic.err
View File

@@ -1 +1 @@
warning: Overwrote a non-zero byte in the old licensee code warning: Overwrote a non-zero byte in the old licensee code

2
test/fix/ram.err
View File

@@ -1 +1 @@
warning: Overwrote a non-zero byte in the RAM size warning: Overwrote a non-zero byte in the RAM size

4
test/fix/ramful-mbc.err
View File

@@ -1,2 +1,2 @@
warning: Overwrote a non-zero byte in the cartridge type 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 RAM size

4
test/fix/ramless-mbc.err
View File

@@ -1,2 +1,2 @@
warning: Overwrote a non-zero byte in the cartridge type 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 RAM size

2
test/fix/sgb.err
View File

@@ -1 +1 @@
warning: Overwrote a non-zero byte in the SGB flag warning: Overwrote a non-zero byte in the SGB flag

2
test/fix/test.sh
View File

@@ -25,7 +25,7 @@ rescolors="$(tput op)"
RGBFIX=./rgbfix RGBFIX=./rgbfix
tryDiff () { tryDiff () {
if ! diff -u --strip-trailing-cr "$1" "$2"; then if ! diff -au --strip-trailing-cr "$1" "$2"; then
echo "${bold}${red}${3:-$1} mismatch!${rescolors}${resbold}" echo "${bold}${red}${3:-$1} mismatch!${rescolors}${resbold}"
false false
fi fi

2
test/fix/title-pad.err
View File

@@ -1 +1 @@
warning: Overwrote a non-zero byte in the title warning: Overwrote a non-zero byte in the title

2
test/fix/title.err
View File

@@ -1 +1 @@
warning: Overwrote a non-zero byte in the title warning: Overwrote a non-zero byte in the title

6
test/fix/verify-pad.err
View File

@@ -1,3 +1,3 @@
warning: Overwrote a non-zero byte in the Nintendo logo 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 header checksum
warning: Overwrote a non-zero byte in the global checksum warning: Overwrote a non-zero byte in the global checksum

6
test/fix/verify-trash.err
View File

@@ -1,3 +1,3 @@
warning: Overwrote a non-zero byte in the Nintendo logo 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 header checksum
warning: Overwrote a non-zero byte in the global checksum warning: Overwrote a non-zero byte in the global checksum

6
test/fix/verify.err
View File

@@ -1,3 +1,3 @@
warning: Overwrote a non-zero byte in the Nintendo logo 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 header checksum
warning: Overwrote a non-zero byte in the global checksum warning: Overwrote a non-zero byte in the global checksum

2
test/fix/version.err
View File

@@ -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

4
test/gfx/test.sh
View File

@@ -83,7 +83,7 @@ for f in *.png; do
newTest "$RGBGFX" $flags "$f" newTest "$RGBGFX" $flags "$f"
if [[ -e "${f%.png}.err" ]]; then if [[ -e "${f%.png}.err" ]]; then
runTest 2>"$errtmp" runTest 2>"$errtmp"
diff -u --strip-trailing-cr "${f%.png}.err" "$errtmp" || failTest diff -au --strip-trailing-cr "${f%.png}.err" "$errtmp" || failTest
else else
runTest && checkOutput "${f%.png}" || failTest $? runTest && checkOutput "${f%.png}" || failTest $?
fi fi
@@ -91,7 +91,7 @@ for f in *.png; do
newTest "$RGBGFX" $flags - "<$f" newTest "$RGBGFX" $flags - "<$f"
if [[ -e "${f%.png}.err" ]]; then if [[ -e "${f%.png}.err" ]]; then
runTest 2>"$errtmp" runTest 2>"$errtmp"
diff -u --strip-trailing-cr <(sed "s/$f/<stdin>/g" "${f%.png}.err") "$errtmp" || failTest diff -au --strip-trailing-cr <(sed "s/$f/<stdin>/g" "${f%.png}.err") "$errtmp" || failTest
else else
runTest && checkOutput "${f%.png}" || failTest $? runTest && checkOutput "${f%.png}" || failTest $?
fi fi

2
test/link/test.sh
View File

@@ -38,7 +38,7 @@ continueTest () {
} }
tryDiff () { tryDiff () {
if ! diff -u --strip-trailing-cr "$1" "$2"; then if ! diff -au --strip-trailing-cr "$1" "$2"; then
echo "${bold}${red}$1 mismatch!${rescolors}${resbold}" echo "${bold}${red}$1 mismatch!${rescolors}${resbold}"
false false
fi fi