From e1ca691f0acb3f98b85b2aa8227caa0a4262061a Mon Sep 17 00:00:00 2001
From: "A. Fachat" <fachat@web.de>
Date: Tue, 19 Aug 2014 22:14:47 +0200
Subject: [PATCH] Allow .a65 files as test files

---
 xa/tests/chardelimiter/Makefile               |  5 +++
 .../chardelimiter/{a.o65 => a.out-delimtest}  |  0
 xa/tests/chardelimiter/runtest.sh             | 32 +++++++++++++++++++
 xa/tests/func.sh                              | 14 ++++++--
 4 files changed, 48 insertions(+), 3 deletions(-)
 create mode 100644 xa/tests/chardelimiter/Makefile
 rename xa/tests/chardelimiter/{a.o65 => a.out-delimtest} (100%)
 create mode 100755 xa/tests/chardelimiter/runtest.sh

diff --git a/xa/tests/chardelimiter/Makefile b/xa/tests/chardelimiter/Makefile
new file mode 100644
index 0000000..b847663
--- /dev/null
+++ b/xa/tests/chardelimiter/Makefile
@@ -0,0 +1,5 @@
+
+tests:
+	./runtest.sh -q -C
+
+
diff --git a/xa/tests/chardelimiter/a.o65 b/xa/tests/chardelimiter/a.out-delimtest
similarity index 100%
rename from xa/tests/chardelimiter/a.o65
rename to xa/tests/chardelimiter/a.out-delimtest
diff --git a/xa/tests/chardelimiter/runtest.sh b/xa/tests/chardelimiter/runtest.sh
new file mode 100755
index 0000000..7ef9a3d
--- /dev/null
+++ b/xa/tests/chardelimiter/runtest.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+# run a test script
+
+#THISDIR=`dirname $0`
+THISDIR=`pwd`
+
+echo "0=$0"
+echo "THISDIR=$THISDIR"
+
+declare -A opts
+#opts=([816.asm]="-w")
+#opts[02.asm]="-C"
+
+#ASMFLAGS=-v
+ASMFLAGS=
+
+# exclude filter from *.asm if no explicit file is given
+EXCLUDE=
+
+# test files used
+TESTFILES=""
+
+# files to compare afterwards, against <file>-<script>
+COMPAREFILES=a.out
+
+XA=$THISDIR/../../xa
+
+##########################
+# actual code
+. ../func.sh
+
diff --git a/xa/tests/func.sh b/xa/tests/func.sh
index bd71dbd..45197c8 100755
--- a/xa/tests/func.sh
+++ b/xa/tests/func.sh
@@ -2,7 +2,7 @@
 
 
 function usage() {
-        echo "Assemble *.asm test files"
+        echo "Assemble *.asm or *.a65 test files"
         echo "  $0 [options] [frs_scripts]"
         echo "Options:"
         echo "       -v                      verbose log"
@@ -126,7 +126,8 @@ fi
 
 # scripts to run
 if [ "x$*" = "x" ]; then
-        SCRIPTS=$THISDIR/*${FILTER}*.asm
+	shopt -s extglob
+        SCRIPTS=$THISDIR/*${FILTER}*.a[s6][m5]
         SCRIPTS=`basename -a $SCRIPTS`;
 
         TESTSCRIPTS=""
@@ -149,7 +150,11 @@ else
                if test -f "$i".asm ; then
                         TESTSCRIPTS="$TESTSCRIPTS $i.asm";
                else
-                        TESTSCRIPTS="$TESTSCRIPTS $i";
+               		if test -f "$i".a65 ; then
+                        	TESTSCRIPTS="$TESTSCRIPTS $i.a65";
+			else
+                       	 	TESTSCRIPTS="$TESTSCRIPTS $i";
+			fi
                fi
         done;
 fi;
@@ -234,6 +239,9 @@ for script in $TESTSCRIPTS; do
 
         if test "x$COMPAREFILES" != "x"; then
                 testname=`basename $script .asm`
+		if [ "$script" = "$testname" ]; then
+                	testname=`basename $script .a65`
+		fi
                 for i in $COMPAREFILES; do
                         NAME="${THISDIR}/${i}-${testname}"
                         if test -f ${NAME}; then