X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/runlisp/blobdiff_plain/1dff83f1891c628ec7dab32bc4958f91fc6e9464..7e3a86038e2a2cbb48b356cb029f9de99c14ec79:/tests.at

diff --git a/tests.at b/tests.at
index d769420..b7991db 100644
--- a/tests.at
+++ b/tests.at
@@ -210,7 +210,7 @@ AT_CHECK([RUNLISP_PATH -e '(format t "Just another Lisp hacker!~%")'],,
 
 ## The `:runlisp-script' keyword should /not/ be in `*features*'.
 traceon
-AT_CHECK([RUNLISP_PATH -p '(find :runlisp-script *features*)'],, [NIL
+AT_CHECK([RUNLISP_PATH -d '(find :runlisp-script *features*)'],, [NIL
 ])
 
 ## Check a mixture of all the kinds of evaluation.  We'll need a stunt script
@@ -229,14 +229,19 @@ cat >script.lisp <<EOF
 	      #'string<))
 EOF
 AT_CHECK([RUNLISP_PATH \
-	    -e '(defpackage [#:]runlisp-test (:export [#:]foo))
-	        (defvar runlisp-test:foo 1)' \
-	    -p runlisp-test:foo \
+	    -e '(defpackage [#:]runlisp-test (:export [#:]foo [#:]bar))
+	        (defvar runlisp-test:foo 1)
+		(defvar runlisp-test:bar "stoat!")' \
+	    -d runlisp-test:foo \
+	    -d runlisp-test:bar \
+	    -p runlisp-test:bar \
 	    -e '(incf runlisp-test:foo)' \
 	    -l script.lisp \
-	    -p runlisp-test:foo \
+	    -d runlisp-test:foo \
 	    -- -e one two three],,
 [1
+"stoat!"
+stoat!
 And we're running the script...
 Command-line arguments: ("-e" "one" "two" "three")
 Symbols in package `COMMON-LISP-USER': ()
@@ -277,10 +282,10 @@ echo Secondary Lisp = $lisp1
 echo Bad Lisp = $badlisp
 
 ## Check that our selection worked.
-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])
+AT_CHECK_UNQUOTED([RUNLISP_PATH -L$lisp0 -d 'WHICH_LISP'],, ["$lisp0"NL])
+AT_CHECK_UNQUOTED([RUNLISP_PATH -L$lisp1 -d 'WHICH_LISP'],, ["$lisp1"NL])
+AT_CHECK([RUNLISP_PATH -L$badlisp -d 'WHICH_LISP'], [127],,
+	 [runlisp: no acceptable Lisp systems found[]NL])
 
 ## Unset all of the user preference mechanisms.
 here=$(pwd)
@@ -288,9 +293,9 @@ mkdir HOME config
 HOME=$here/HOME XDG_CONFIG_HOME=$here/config; export HOME XDG_CONFIG_HOME
 
 ## We generally take the first one listed that exists.
-AT_CHECK_UNQUOTED([RUNLISP_PATH -L$lisp0,$lisp1 -p 'WHICH_LISP'],, ["$lisp0"NL])
-AT_CHECK_UNQUOTED([RUNLISP_PATH -L$lisp1,$lisp0 -p 'WHICH_LISP'],, ["$lisp1"NL])
-AT_CHECK_UNQUOTED([RUNLISP_PATH -L$badlisp,$lisp0,$lisp1 -p 'WHICH_LISP'],,
+AT_CHECK_UNQUOTED([RUNLISP_PATH -L$lisp0,$lisp1 -d 'WHICH_LISP'],, ["$lisp0"NL])
+AT_CHECK_UNQUOTED([RUNLISP_PATH -L$lisp1,$lisp0 -d 'WHICH_LISP'],, ["$lisp1"NL])
+AT_CHECK_UNQUOTED([RUNLISP_PATH -L$badlisp,$lisp0,$lisp1 -d 'WHICH_LISP'],,
 		  ["$lisp0"NL])
 
 ## Check parsing of embedded options.
@@ -334,8 +339,6 @@ EOF
   rm -f $conf
 done
 
-
-
 AT_CLEANUP
 
 ###----- That's all, folks --------------------------------------------------