Merge pull request #400 from NieDzejkob/out.pipe-substitute

test/asm: Generate .out.pipe files on the fly

test/asm/bracketed-symbols.out.pipe

@@ -1,12 +0,0 @@
-ERROR: -(16):
-    Print types are only allowed for numbers
-ERROR: -(20):
-    Expression must have a constant value
-$2A
-2a
-2A
-42
-101010
-10100111001
-0
-You can't format me!

test/asm/correct-line-number.out.pipe

@@ -1,4 +0,0 @@
-warning: -(5):
-    Am I geting ahead of myself?
-warning: -(11):
-    Hopefully not.

test/asm/divzero-instr.out.pipe

@@ -1,2 +0,0 @@
-ERROR: -(2):
-    Division by zero

test/asm/divzero-section-bank.out.pipe

@@ -1,4 +0,0 @@
-ERROR: -(1):
-    Invalid integer constant
-ERROR: -(1):
-    Division by zero

test/asm/equs-recursion.out.pipe

@@ -1,2 +0,0 @@
-ERROR: -(2):
-    Recursion limit (64) exceeded

test/asm/garbage_char.out.pipe

@@ -1,2 +0,0 @@
-ERROR: -(1):
-    Found garbage character: 0xFF

test/asm/include-recursion.out.pipe

@@ -1,2 +0,0 @@
-ERROR: -(1) -> include-recursion.asm(1) -> include-recursion.asm(1) -> include-recursion.asm(1) -> include-recursion.asm(1) -> include-recursion.asm(1) -> include-recursion.asm(1) -> include-recursion.asm(1) -> include-recursion.asm(1) -> include-recursion.asm(1) -> include-recursion.asm(1) -> include-recursion.asm(1) -> include-recursion.asm(1) -> include-recursion.asm(1) -> include-recursion.asm(1) -> include-recursion.asm(1) -> include-recursion.asm(1) -> include-recursion.asm(1) -> include-recursion.asm(1) -> include-recursion.asm(1) -> include-recursion.asm(1) -> include-recursion.asm(1) -> include-recursion.asm(1) -> include-recursion.asm(1) -> include-recursion.asm(1) -> include-recursion.asm(1) -> include-recursion.asm(1) -> include-recursion.asm(1) -> include-recursion.asm(1) -> include-recursion.asm(1) -> include-recursion.asm(1) -> include-recursion.asm(1) -> include-recursion.asm(1) -> include-recursion.asm(1) -> include-recursion.asm(1) -> include-recursion.asm(1) -> include-recursion.asm(1) -> include-recursion.asm(1) -> include-recursion.asm(1) -> include-recursion.asm(1) -> include-recursion.asm(1) -> include-recursion.asm(1) -> include-recursion.asm(1) -> include-recursion.asm(1) -> include-recursion.asm(1) -> include-recursion.asm(1) -> include-recursion.asm(1) -> include-recursion.asm(1) -> include-recursion.asm(1) -> include-recursion.asm(1) -> include-recursion.asm(1) -> include-recursion.asm(1) -> include-recursion.asm(1) -> include-recursion.asm(1) -> include-recursion.asm(1) -> include-recursion.asm(1) -> include-recursion.asm(1) -> include-recursion.asm(1) -> include-recursion.asm(1) -> include-recursion.asm(1) -> include-recursion.asm(1) -> include-recursion.asm(1) -> include-recursion.asm(1) -> include-recursion.asm(1) -> include-recursion.asm(1):
-    Recursion limit (64) exceeded

test/asm/label-macro-arg.out.pipe

@@ -1,10 +0,0 @@
-ERROR: -(45) -> -::test_char(31):
-    Macro 'something' not defined
-$5
-$6
-$7
-$8
-sizeof__something equals $1
-sizeof_@something equals $1
-sizeof_#something equals $1
-sizeof_.something equals $1

test/asm/label-redefinition.out.pipe

@@ -1,3 +0,0 @@
-ERROR: -(7):
-    'Sym' already defined in -::m(6)
-error: Assembly aborted (1 errors)!

test/asm/local-ref-without-parent.out.pipe

@@ -1,2 +0,0 @@
-ERROR: -(3):
-    Local label reference '.test' in main scope

test/asm/local-without-parent.out.pipe

@@ -1,2 +0,0 @@
-ERROR: -(2):
-    Local label in main scope

test/asm/local-wrong-parent.out.pipe

@@ -1,3 +0,0 @@
-ERROR: -(5):
-    Not currently in the scope of 'WrongParent'
-error: Assembly aborted (1 errors)!

test/asm/macro-@.out.pipe

@@ -1,2 +0,0 @@
-ERROR: -(1):
-    Macro '@' not defined

test/asm/macro-recursion.out.pipe

@@ -1,2 +0,0 @@
-ERROR: -(4) -> -::recurse(2) -> -::recurse(2) -> -::recurse(2) -> -::recurse(2) -> -::recurse(2) -> -::recurse(2) -> -::recurse(2) -> -::recurse(2) -> -::recurse(2) -> -::recurse(2) -> -::recurse(2) -> -::recurse(2) -> -::recurse(2) -> -::recurse(2) -> -::recurse(2) -> -::recurse(2) -> -::recurse(2) -> -::recurse(2) -> -::recurse(2) -> -::recurse(2) -> -::recurse(2) -> -::recurse(2) -> -::recurse(2) -> -::recurse(2) -> -::recurse(2) -> -::recurse(2) -> -::recurse(2) -> -::recurse(2) -> -::recurse(2) -> -::recurse(2) -> -::recurse(2) -> -::recurse(2) -> -::recurse(2) -> -::recurse(2) -> -::recurse(2) -> -::recurse(2) -> -::recurse(2) -> -::recurse(2) -> -::recurse(2) -> -::recurse(2) -> -::recurse(2) -> -::recurse(2) -> -::recurse(2) -> -::recurse(2) -> -::recurse(2) -> -::recurse(2) -> -::recurse(2) -> -::recurse(2) -> -::recurse(2) -> -::recurse(2) -> -::recurse(2) -> -::recurse(2) -> -::recurse(2) -> -::recurse(2) -> -::recurse(2) -> -::recurse(2) -> -::recurse(2) -> -::recurse(2) -> -::recurse(2) -> -::recurse(2) -> -::recurse(2) -> -::recurse(2) -> -::recurse(2) -> -::recurse(2):
-    Recursion limit (64) exceeded

test/asm/multiple-charmaps.out.pipe

@@ -1,44 +0,0 @@
-warning: -(75):
-    Using 'charmap' within a section when the current charmap is 'main' is deprecated
-ERROR: -(100) -> -::new_(7):
-    Charmap 'map1' already exists
-ERROR: -(102) -> -::set_(13):
-    Charmap 'map5' doesn't exist
-ERROR: -(104) -> -::pop_(23):
-    No entries in the charmap stack
-main charmap
-$0
-newcharmap map1
-$6162
-newcharmap map2, main
-$0
-setcharmap map1
-$6162
-newcharmap map3
-$1
-newcharmap map4, map3
-$1
-$2
-setcharmap map3
-$1
-$6364
-setcharmap main
-$0
-override main charmap
-$6162
-$3
-setcharmap map1
-pushc
-setcharmap map2
-pushc
-setcharmap map3
-$1
-$6364
-$6566
-popc
-$0
-popc
-$6162
-newcharmap map1
-setcharmap map5
-popc

test/asm/null-in-macro.out.pipe

@@ -1,2 +0,0 @@
-ERROR: -(1):
-    Unterminated MACRO definition.

test/asm/operator-precedence.out.pipe

@@ -1,2 +0,0 @@
-$1
-$1

test/asm/overflow.out.pipe

@@ -1,18 +0,0 @@
-warning: -(24):
-    Division of min value by -1
-warning: -(25):
-    Division of min value by -1
-warning: -(34):
-    Left shift of negative value: -1
-warning: -(35):
-    Left shift of negative value: -1
-warning: -(39):
-    Integer constant '4294967296' is too large
-warning: -(42):
-    Graphics constant '`333333333' is too long
-$80000000
-$7FFFFFFF
-$80000000
-$80000000
-$0
-$FFFFFFFE

test/asm/pops-no-pushed-sections.out.pipe

@@ -1,2 +0,0 @@
-ERROR: -(1):
-    No entries in the section stack

test/asm/pops-restore-no-section.out.pipe

@@ -1,2 +0,0 @@
-ERROR: -(10):
-    Code generation before SECTION directive

test/asm/reference-undefined-sym.out.pipe

@@ -1,3 +0,0 @@
-ERROR: -(4):
-    'X' already referenced at -(2)
-error: Assembly aborted (1 errors)!

test/asm/remote-local-noexist.out.pipe

@@ -1,2 +0,0 @@
-ERROR: -(7):
-    'Parent.child.fail' is a nonsensical reference to a nested local symbol

test/asm/strlen.out.pipe

@@ -1,2 +0,0 @@
-$3
-$4

test/asm/strsub.out.pipe

@@ -1,31 +0,0 @@
-warning: -(13) -> -::xstrsub(4):
-    STRSUB: Length too big: 32
-warning: -(14) -> -::xstrsub(4):
-    STRSUB: Length too big: 300
-warning: -(15) -> -::xstrsub(4):
-    STRSUB: Position starts at 1
-warning: -(15) -> -::xstrsub(4):
-    STRSUB: Length too big: 300
-warning: -(16) -> -::xstrsub(4):
-    STRSUB: Position 4 is past the end of the string
-warning: -(17) -> -::xstrsub(4):
-    STRSUB: Position 4 is past the end of the string
-warning: -(17) -> -::xstrsub(4):
-    STRSUB: Length too big: 1
-warning: -(20) -> -::xstrsub(4):
-    STRSUB: Length too big: 10
-A
-B
-C
-AB
-BC
-BC
-BC
-ABC
-
-
-カタ
-カナ
-カナ
-g
-g̈

test/asm/symbol-override.out.pipe

@@ -1,8 +0,0 @@
-ERROR: -(6):
-    'W' already defined as constant at -(5)
-ERROR: -(10):
-    'X' already defined as constant at -(9)
-ERROR: -(14):
-    'Y' already defined as non-constant at -(13)
-error: Assembly aborted (3 errors)!
-V=$1

test/asm/test.sh

@@ -9,11 +9,27 @@ for i in *.asm; do
 	for variant in '' '.pipe'; do
 		if [ -z "$variant" ]; then
 			../../rgbasm -o $o $i > $after 2>&1
+			desired_output=${i%.asm}.out
 		else
-			cat $i | ../../rgbasm -o $o - > $after 2>&1
+			# `include-recursion.asm` refers to its own name inside the test code.
+			# Skip testing with stdin input for that file.
+			if [ "$i" = "include-recursion.asm" ]; then
+				continue
 			fi
 
-		diff -u ${i%.asm}.out$variant $after
+			# Stop! This is not a Useless Use Of Cat. Using cat instead of
+			# stdin redirection makes the input an unseekable pipe - a scenario
+			# that's harder to deal with and was broken when the feature was
+			# first implemented.
+			cat $i | ../../rgbasm -o $o - > $after 2>&1
+
+			# Escape regex metacharacters
+			desired_output=$before
+			subst="$(printf '%s\n' "$i" | sed 's:[][\/.^$*]:\\&:g')"
+			sed "s/$subst/-/g" ${i%.asm}.out > $desired_output
+		fi
+
+		diff -u $desired_output $after
 		rc=$(($? || $rc))
 		bin=${i%.asm}.out.bin
 		if [ -f $bin ]; then

test/asm/undefined-dot.out.pipe

@@ -1 +0,0 @@
-error: -(3) : '.' not defined