diff --git a/test/asm/align-pc.out.bin b/test/asm/align-pc.out.bin index e69de29b..ec777de5 100644 Binary files a/test/asm/align-pc.out.bin and b/test/asm/align-pc.out.bin differ diff --git a/test/asm/load-pushs.out.bin b/test/asm/load-pushs.out.bin index 458f0df2..dd3a4910 100644 Binary files a/test/asm/load-pushs.out.bin and b/test/asm/load-pushs.out.bin differ diff --git a/test/asm/pc.out.bin b/test/asm/pc.out.bin index c2cc4a1f..b8522bf3 100644 Binary files a/test/asm/pc.out.bin and b/test/asm/pc.out.bin differ diff --git a/test/asm/ram-code.out.bin b/test/asm/ram-code.out.bin index e69de29b..ba867a10 100644 Binary files a/test/asm/ram-code.out.bin and b/test/asm/ram-code.out.bin differ diff --git a/test/asm/test.sh b/test/asm/test.sh index d7091443..c9ddbca5 100755 --- a/test/asm/test.sh +++ b/test/asm/test.sh @@ -115,12 +115,11 @@ for i in *.asm notexist.asm; do desired_binname=${i%.asm}.out.bin if [[ -f "$desired_binname" && $our_rc -eq 0 ]]; then - if ! "$RGBLINK" -o "$gb" "$o"; then - echo "${bold}${red}\`$RGBLINK -o $gb $o\` failed!${rescolors}${resbold}" + # 'rgblink -x' implies '-t', so asm/*.out.bin tests cannot use ROMX past 1 + if ! "$RGBLINK" -x -o "$gb" "$o"; then + echo "${bold}${red}\`$RGBLINK -x -o $gb $o\` failed!${rescolors}${resbold}" else - rom_size=$(printf %s $(wc -c <"$desired_binname")) - dd if="$gb" count=1 bs="$rom_size" >"$output" 2>/dev/null - tryCmp "$desired_binname" "$output" gb + tryCmp "$desired_binname" "$gb" gb (( our_rc = our_rc || $? )) fi fi diff --git a/test/link/test.sh b/test/link/test.sh index 15958c75..0d2ca49f 100755 --- a/test/link/test.sh +++ b/test/link/test.sh @@ -58,6 +58,7 @@ tryCmp () { tryCmpRom () { # `printf` lets us keep only the first returned word from `wc`. rom_size=$(printf %s $(wc -c <"$1")) + # 'rgblink -x' implies '-t', so we cannot use '-x' to trim the ROM output dd if="$gbtemp" count=1 bs="$rom_size" >"$otemp" 2>/dev/null tryCmp "$1" "$otemp" }