diff --git a/test/link/linkerscript-escapes-test.out b/test/link/linkerscript-escapes-test.out index a3aebf50..ab92df28 100644 --- a/test/link/linkerscript-escapes-test.out +++ b/test/link/linkerscript-escapes-test.out @@ -1,2 +1,2 @@ -error: ./linkerscript-escapes-test.link(4): Cannot escape character '{' +error: linkerscript-escapes-test.link(4): Cannot escape character '{' Linking failed with 1 error diff --git a/test/link/section-attributes-mismatch.out b/test/link/section-attributes-mismatch.out index 6cde6d77..ad2d63b8 100644 --- a/test/link/section-attributes-mismatch.out +++ b/test/link/section-attributes-mismatch.out @@ -1,2 +1,2 @@ -error: ./section-attributes-mismatch.link(3): The linker script assigns section "sec" to address $0018, but that would be ALIGN[4, 8] instead of the requested ALIGN[4, 2] +error: section-attributes-mismatch.link(3): The linker script assigns section "sec" to address $0018, but that would be ALIGN[4, 8] instead of the requested ALIGN[4, 2] Linking failed with 1 error diff --git a/test/link/test.sh b/test/link/test.sh index 01e1b631..086caeb3 100755 --- a/test/link/test.sh +++ b/test/link/test.sh @@ -80,13 +80,15 @@ for i in *.asm; do fi # Other tests have several linker scripts - while read -rd '' script; do + for script in "${i%.asm}"*.link; do + [[ -e "$script" ]] || break # If the glob doesn't match, it just... doesn't expand! + rgblinkQuiet -l "$script" -o "$gbtemp" "$otemp" >"$outtemp" 2>&1 tryDiff "${script%.link}.out" "$outtemp" (( rc = rc || $? )) - ran_flag=1 - done < <(find . -name "${i%.asm}*.link" -print0) - if [ -n "$ran_flag" ]; then + ran_flag=true + done + if "$ran_flag"; then continue fi