more mods for testruns

merlintests.sh

@@ -18,7 +18,7 @@ for S in $SRC ; do
 	BASE=${S/.S/}
 	BASE=${BASE/.s/}
 	cd ./testdata
-	merlin32 $S 2>/dev/null >/dev/null
+	merlin32 . $S 2>/dev/null >/dev/null
 	#merlin32 . $S 2>/dev/null 
 
 	R=?$

runtests.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-OUTDIR=./testout
+OUTDIR=./qasmout
 TMPFILE=/tmp/qasm_out.txt
 
 rm -f $TMPFILE
@@ -40,6 +40,7 @@ for S in $SRC ; do
 	MSHA="Q"
 	QSHA="M"
 
+
 	if [ -f ./m32out/$BASE.bin ] ; then
 	  MSHA=`sha256sum ./m32out/$BASE.bin | awk '{ print $1;}'` 2>/dev/null >/dev/null
     fi
@@ -47,7 +48,7 @@ for S in $SRC ; do
     if [ -f $OUTDIR/$BASE.bin ] ; then
 	   QSHA=`sha256sum $OUTDIR/$BASE.bin |awk '{print $1;}'` 2>/dev/null >/dev/null
     fi
-	#echo "$MSHA    $QSHA"
+    #echo "MSHA=$MSHA    QSHA=$QSHA"
 
 	shapass=0;
 	CX=" "

testdata/3001-lroathe.S

@@ -114,7 +114,7 @@ START
             adc     _num1+dum1 
             sbc     _num1+dum1 
             bit     _num1+dum0 
-            sta     _num1+dum0 ;(FIXED): can't use sta _num1+dum0
+            sta     _num1+dum0 ;(FIXED): can't use sta _num1+dum0 '
             stz     _num1+dum0 
 
             lda     _num1+dum0,x 
@@ -180,7 +180,7 @@ myQuit
 
 
             ldaz    $FFFF   ; forced DP
-            lda:    $FFFF   ; forced ABS (any char but 'L', 'D', and 'Z"
+            lda:    $FFFF   ; forced ABS (any char but 'L', 'D', and 'Z'
             ldal    $FFFF   ; forced long abs (3 byte address)
 
             ldaz    $05     
@@ -338,8 +338,6 @@ myQuit
             lda     #^$A51234 ;bank
 
 
-            mx      MX      
-
             lda     $0008   ;ZP
             lda     $08     ;ZP
             lda     $ffff-$fff7 ;ZP
@@ -362,8 +360,8 @@ L00BC       bit     L00BC
 
             hex		;no error
             hex     11,22,33,44,55,66,77,88,99 
-            hex     112233445566778899F 
-            hex     112233445I566778899FF 
+            ;hex     112233445566778899F 
+            ;hex     112233445I566778899FF 
 
             hex     aabb,CC,0123456789abcdefABCDEF,ff 
 

testdata/3002-testfile.S

@@ -14,7 +14,7 @@ lexpr       =     $010203
 immed       =     $123456     
 neg         equ   -16         
 
-]var1 		= v1234
+*]var1 		= v1234
 
                               ;lst off
 start00                      
@@ -308,5 +308,5 @@ startF0
             inc   expr,x      
             sbcl  lexpr,x     
             lst   off         
-            sav   ./test.bin  
+            ;sav   ./test.bin