X-Git-Url: https://git.distorted.org.uk/~mdw/runlisp/blobdiff_plain/8996f767e047eefa8af4d01b1434b54f4c169b79..8b79df0a21daf5be382dcf67364a3c6eefce2dcd:/tests.at

diff --git a/tests.at b/tests.at
index 8c5d0c6..867ae5e 100644
--- a/tests.at
+++ b/tests.at
@@ -51,7 +51,7 @@ unset RUNLISP_USERCONFIG
 m4_define([PREPARE_LISP_TEST],
 [SETUP_RUNLISP_ENV
 lisp=$1
-LISP=$m4_translit(m4_bregexp([$1], [/.*$], []), [a-z], [A-Z])
+LISP=$m4_translit(m4_bpatsubst([$1], [/.*$], []), [a-z], [A-Z])
 AT_SKIP_IF([test "x$LISP" = x])
 case $lisp in
   */*) opt=${lisp#*/} lisp=${lisp%%/*} ;;
@@ -229,14 +229,17 @@ cat >script.lisp <<EOF
 	      #'string<))
 EOF
 AT_CHECK([RUNLISP_PATH \
-	    -e '(defpackage [#:]runlisp-test (:export [#:]foo))
-	        (defvar runlisp-test:foo 1)' \
+	    -e '(defpackage [#:]runlisp-test (:export [#:]foo [#:]bar))
+	        (defvar runlisp-test:foo 1)
+		(defvar runlisp-test:bar "stoat!")' \
 	    -p runlisp-test:foo \
+	    -p runlisp-test:bar \
 	    -e '(incf runlisp-test:foo)' \
 	    -l script.lisp \
 	    -p runlisp-test:foo \
 	    -- -e one two three],,
 [1
+"stoat!"
 And we're running the script...
 Command-line arguments: ("-e" "one" "two" "three")
 Symbols in package `COMMON-LISP-USER': ()
@@ -280,7 +283,7 @@ echo Bad Lisp = $badlisp
 AT_CHECK_UNQUOTED([RUNLISP_PATH -L$lisp0 -p 'WHICH_LISP'],, ["$lisp0"NL])
 AT_CHECK_UNQUOTED([RUNLISP_PATH -L$lisp1 -p 'WHICH_LISP'],, ["$lisp1"NL])
 AT_CHECK([RUNLISP_PATH -L$badlisp -p 'WHICH_LISP'], [127],,
-[runlisp: no acceptable Lisp systems found[]NL])
+	 [runlisp: no acceptable Lisp systems found[]NL])
 
 ## Unset all of the user preference mechanisms.
 here=$(pwd)