gbdev/rgbds
1
0 Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2026-10-03 02:35:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Consistently compare outputs for RGBGFX tests even when .err exists (#2177)

Browse Source
This commit is contained in:
Rangi authored and GitHub committed 2026-09-27 13:21:06 -04:00
1 parent c0a16e4bad
commit 32a9d3a01b
1 file changed
+11 -5
Download Patch File Download Diff File Expand all files Collapse all files
test/gfx/test.sh
+11 -5
View File
@@ -89,20 +89,26 @@ for f in *.png; do
done done
newTest "$RGBGFX" $flags "$f" newTest "$RGBGFX" $flags "$f"
test_rc=0
if [[ -e "${f%.png}.err" ]]; then if [[ -e "${f%.png}.err" ]]; then
runTest 2>"$errtmp" runTest 2>"$errtmp"
diff -au --strip-trailing-cr "${f%.png}.err" "$errtmp" || failTest diff -au --strip-trailing-cr "${f%.png}.err" "$errtmp" || test_rc=$?
else else
runTest && checkOutput "${f%.png}" || failTest $? runTest || test_rc=$?
fi fi
checkOutput "${f%.png}" || test_rc=$?
(( test_rc )) && failTest $test_rc
newTest "$RGBGFX" $flags - "<$f" newTest "$RGBGFX" $flags - "<$f"
test_rc=0
if [[ -e "${f%.png}.err" ]]; then if [[ -e "${f%.png}.err" ]]; then
runTest 2>"$errtmp" runTest 2>"$errtmp"
diff -au --strip-trailing-cr "${f%.png}.err" <(sed "s#<stdin>#${f//#/\\#}#g" "$errtmp") || failTest diff -au --strip-trailing-cr "${f%.png}.err" <(sed "s#<stdin>#${f//#/\\#}#g" "$errtmp") || test_rc=$?
else else
runTest && checkOutput "${f%.png}" || failTest $? runTest || test_rc=$?
fi fi
checkOutput "${f%.png}" || test_rc=$?
(( test_rc )) && failTest $test_rc
done done
for f in *.[12]bpp; do for f in *.[12]bpp; do
@@ -122,7 +128,7 @@ for f in *.[12]bpp; do
if [[ -e "${f%.[12]bpp}.err" ]]; then if [[ -e "${f%.[12]bpp}.err" ]]; then
newTest "$RGBGFX $flags -o $f -r 1 result.png" newTest "$RGBGFX $flags -o $f -r 1 result.png"
runTest 2>"$errtmp" runTest 2>"$errtmp"
diff -au --strip-trailing-cr "${f%.[12]bpp}.err" <(sed "s#<stdin>#${f//#/\\#}#g" "$errtmp") || failTest diff -au --strip-trailing-cr "${f%.[12]bpp}.err" <(sed "s#<stdin>#${f//#/\\#}#g" "$errtmp") || failTest $?
else else
newTest "$RGBGFX $flags -o $f -r 1 result.png && $RGBGFX $flags -o result.2bpp result.png" newTest "$RGBGFX $flags -o $f -r 1 result.png && $RGBGFX $flags -o result.2bpp result.png"
runTest && tryCmp "$f" result.2bpp || failTest $? runTest && tryCmp "$f" result.2bpp || failTest $?