diff --git a/test/asm/anon-label-bad.simple.err b/test/asm/anon-label-bad.simple.err deleted file mode 100644 index 87274794..00000000 --- a/test/asm/anon-label-bad.simple.err +++ /dev/null @@ -1,11 +0,0 @@ -error: anon-label-bad.asm(2): - Label "!0" created outside of a SECTION -error: anon-label-bad.asm(6): - Reference to anonymous label 2 before, when only 1 has been created so far -error: anon-label-bad.asm(9): - syntax error -error: anon-label-bad.asm(10): - syntax error -error: anon-label-bad.asm(22): - syntax error -error: Assembly aborted (5 errors)! diff --git a/test/asm/block-comment-termination-error.simple.err b/test/asm/block-comment-termination-error.simple.err deleted file mode 100644 index 2517422b..00000000 --- a/test/asm/block-comment-termination-error.simple.err +++ /dev/null @@ -1,5 +0,0 @@ -error: block-comment-termination-error.asm(1): - Unterminated block comment -error: block-comment-termination-error.asm(1): - syntax error -error: Assembly aborted (2 errors)! diff --git a/test/asm/def.simple.err b/test/asm/def.simple.err deleted file mode 100644 index a503bb5d..00000000 --- a/test/asm/def.simple.err +++ /dev/null @@ -1,5 +0,0 @@ -error: def.asm(23): - 'constant' already defined at def.asm(10) -error: def.asm(29): - syntax error -error: Assembly aborted (2 errors)! diff --git a/test/asm/error-recovery.simple.err b/test/asm/error-recovery.simple.err deleted file mode 100644 index 3f270237..00000000 --- a/test/asm/error-recovery.simple.err +++ /dev/null @@ -1,5 +0,0 @@ -error: error-recovery.asm(3): - syntax error -error: error-recovery.asm(5) -> error-recovery.asm::REPT~1(7): - syntax error -error: Assembly aborted (2 errors)! diff --git a/test/asm/expand-empty-string.simple.err b/test/asm/expand-empty-string.simple.err deleted file mode 100644 index be33f0b9..00000000 --- a/test/asm/expand-empty-string.simple.err +++ /dev/null @@ -1,3 +0,0 @@ -error: expand-empty-string.asm(6) -> expand-empty-string.asm::test(4): - syntax error -error: Assembly aborted (1 error)! diff --git a/test/asm/label-macro-arg.simple.err b/test/asm/label-macro-arg.simple.err deleted file mode 100644 index cd9ef65e..00000000 --- a/test/asm/label-macro-arg.simple.err +++ /dev/null @@ -1,28 +0,0 @@ -warning: label-macro-arg.asm(13) -> label-macro-arg.asm::m2(9): [-Wobsolete] - `y =` is deprecated; use `DEF y =` -warning: label-macro-arg.asm(15) -> label-macro-arg.asm::m2(9): [-Wobsolete] - `yy =` is deprecated; use `DEF yy =` -error: label-macro-arg.asm(38) -> label-macro-arg.asm::test_char(25): - Local label 'sizeof_.something' in main scope -while expanding symbol "VAR_DEF" -error: label-macro-arg.asm(38) -> label-macro-arg.asm::test_char(25): - syntax error -while expanding symbol "VAR_DEF" -error: label-macro-arg.asm(38) -> label-macro-arg.asm::test_char(26): - Local label 'sizeof_.something' in main scope -error: label-macro-arg.asm(38) -> label-macro-arg.asm::test_char(29): - Interpolated symbol "sizeof_.something" does not exist -error: label-macro-arg.asm(39) -> label-macro-arg.asm::test_char(25): - Label "sizeof_" created outside of a SECTION -while expanding symbol "VAR_DEF" -error: label-macro-arg.asm(39) -> label-macro-arg.asm::test_char(25): - Macro "something" not defined -error: label-macro-arg.asm(39) -> label-macro-arg.asm::test_char(26): - 'sizeof_' already defined at label-macro-arg.asm(39) -> label-macro-arg.asm::test_char(25) -error: label-macro-arg.asm(39) -> label-macro-arg.asm::test_char(26): - Macro "something" not defined -error: label-macro-arg.asm(39) -> label-macro-arg.asm::test_char(29): - Invalid format spec 'sizeof_' -error: label-macro-arg.asm(39) -> label-macro-arg.asm::test_char(29): - Interpolated symbol "something" does not exist -error: Assembly aborted (10 errors)! diff --git a/test/asm/macro-syntax.simple.err b/test/asm/macro-syntax.simple.err deleted file mode 100644 index cb1baf18..00000000 --- a/test/asm/macro-syntax.simple.err +++ /dev/null @@ -1,9 +0,0 @@ -error: macro-syntax.asm(7): - Label "old" created outside of a SECTION -error: macro-syntax.asm(7): - syntax error -error: macro-syntax.asm(8): - '\1' cannot be used outside of a macro -error: macro-syntax.asm(9): - syntax error -error: Assembly aborted (4 errors)! diff --git a/test/asm/nested-macrodef.simple.err b/test/asm/nested-macrodef.simple.err deleted file mode 100644 index 7df121d6..00000000 --- a/test/asm/nested-macrodef.simple.err +++ /dev/null @@ -1,7 +0,0 @@ -warning: nested-macrodef.asm(26) -> nested-macrodef.asm::outer(22): [-Wuser] - Nested macros shouldn't work, whose argument would be \1? -error: nested-macrodef.asm(26) -> nested-macrodef.asm::outer(24): - Unterminated macro definition -error: nested-macrodef.asm(27): - syntax error -error: Assembly aborted (2 errors)! diff --git a/test/asm/period.simple.err b/test/asm/period.simple.err deleted file mode 100644 index 22a4095e..00000000 --- a/test/asm/period.simple.err +++ /dev/null @@ -1,3 +0,0 @@ -error: period.asm(5): - syntax error -error: Assembly aborted (1 error)! diff --git a/test/asm/syntax-error-after-syntax-error.simple.err b/test/asm/syntax-error-after-syntax-error.simple.err deleted file mode 100644 index 66caa7f9..00000000 --- a/test/asm/syntax-error-after-syntax-error.simple.err +++ /dev/null @@ -1,13 +0,0 @@ -error: syntax-error-after-syntax-error.asm(6): - syntax error -error: syntax-error-after-syntax-error.asm(7): - syntax error - To invoke `mac` as a macro it must be indented -error: syntax-error-after-syntax-error.asm(8): - syntax error - To invoke `mac` as a macro it must be indented -error: syntax-error-after-syntax-error.asm(9): - 'mac' already defined at syntax-error-after-syntax-error.asm(1) -error: syntax-error-after-syntax-error.asm(10): - 'mac' already defined at syntax-error-after-syntax-error.asm(1) -error: Assembly aborted (5 errors)! diff --git a/test/asm/syntax-error-eof-newline.simple.err b/test/asm/syntax-error-eof-newline.simple.err deleted file mode 100644 index 7a5f4a63..00000000 --- a/test/asm/syntax-error-eof-newline.simple.err +++ /dev/null @@ -1,3 +0,0 @@ -error: syntax-error-eof-newline.asm(5) -> syntax-error-eof-newline.inc(1): - syntax error -error: Assembly aborted (1 error)! diff --git a/test/asm/syntax-error.simple.err b/test/asm/syntax-error.simple.err deleted file mode 100644 index 0d72e0ba..00000000 --- a/test/asm/syntax-error.simple.err +++ /dev/null @@ -1,3 +0,0 @@ -error: syntax-error.asm(2): - syntax error -error: Assembly aborted (1 error)! diff --git a/test/asm/test.sh b/test/asm/test.sh index 1ccc940d..d4b115ac 100755 --- a/test/asm/test.sh +++ b/test/asm/test.sh @@ -59,15 +59,6 @@ else rm -f version.asm fi -# Check whether to use '.simple.err' files if they exist -# (rgbasm with pre-3.0 Bison just reports "syntax error") -$RGBASM -Weverything -o "$o" syntax-error.asm >"$output" 2>"$errput" -simple_error=0 -if ! diff --strip-trailing-cr syntax-error.err "$errput"; then - echo "${bold}${orange}Warning: using .simple.err files when available.${rescolors}${resbold}" - simple_error=1 -fi - for i in *.asm; do flags=${i%.asm}.flags RGBASMFLAGS=-Weverything @@ -82,9 +73,7 @@ for i in *.asm; do else desired_outname=/dev/null fi - if [ "$simple_error" -eq 1 ] && [ -e "${i%.asm}.simple.err" ]; then - desired_errname=${i%.asm}.simple.err - elif [ -e "${i%.asm}.err" ]; then + if [ -e "${i%.asm}.err" ]; then desired_errname=${i%.asm}.err else desired_errname=/dev/null