X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Frun-tests.sh;h=674b965ff23589b0ff899716c945e0fb9ed8fb87;hb=760349abe9068fe4e5e3c03013f3533b64602a93;hp=3c72812e97e02e8b535a81622692294d94542252;hpb=1026ecf53d97cd568ab94f9a459e73bfa19d425b;p=sbcl.git

diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index 3c72812..674b965 100644
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -20,7 +20,7 @@
 # generated relative to `pwd` in the tests/ directory) so that tests
 # can chdir before invoking SBCL and still work.
 sbclstem=`pwd`/../src/runtime/sbcl
-SBCL="${1:-$sbclstem --core `pwd`/../output/sbcl.core --noinform --sysinit /dev/null --userinit /dev/null --noprint --disable-debugger}"
+SBCL="${1:-$sbclstem --core `pwd`/../output/sbcl.core --noinform --sysinit /dev/null --userinit /dev/null --noprint}"
 export SBCL
 echo /running tests on SBCL=\'$SBCL\'
 # more or less like SBCL, but without enough grot removed that appending
@@ -44,10 +44,10 @@ echo /with SBCL_ALLOWING_CORE=\'$SBCL_ALLOWING_CORE\'
 # returned unless we exit through the intended explicit "test
 # successful" path.
 tenfour () {
-    if [ $? = 104 ]; then
+    if [ $1 = 104 ]; then
 	echo ok
     else
-	echo test failed, expected 104 return code, got $?
+	echo test $2 failed, expected 104 return code, got $1
 	exit 1
     fi
 }
@@ -58,13 +58,15 @@ echo //running '*.pure.lisp' tests
 echo //i.e. *.pure.lisp
 (
 echo "(progn"
+echo "  (progn (format t \"//loading assertoid.lisp~%\") (load \"assertoid.lisp\"))"
+echo "  (use-package \"ASSERTOID\")"
 for f in *.pure.lisp; do
     if [ -f $f ]; then
         echo "  (progn (format t \"//running $f test~%\") (load \"$f\"))"
     fi
 done
 echo "  (sb-ext:quit :unix-status 104)) ; Return status=success."
-) | $SBCL ; tenfour
+) | $SBCL ; tenfour $? "(pure.lisp files)"
 
 # *.impure.lisp files are Lisp code with side effects (e.g. doing
 # DEFSTRUCT or DEFTYPE or DEFVAR, or messing with the read table).
@@ -75,7 +77,7 @@ echo //running '*.impure.lisp' tests
 for f in *.impure.lisp; do
     if [ -f $f ]; then
         echo //running $f test
-        echo "(load \"$f\")" | $SBCL ; tenfour
+        echo "(load \"$f\")" | $SBCL ; tenfour $? $f
     fi
 done
 
@@ -87,7 +89,7 @@ echo //running '*.test.sh' tests
 for f in *.test.sh; do
     if [ -f $f ]; then
 	echo //running $f test
-	sh $f "$SBCL"; tenfour
+	sh $f "$SBCL"; tenfour $? $f
     fi
 done
 
@@ -97,7 +99,7 @@ echo //running '*.assertoids' tests
 for f in *.assertoids; do
     if [ -f $f ]; then
 	echo //running $f test
-	echo "(load \"$f\")" | $SBCL --eval '(load "assertoid.lisp")' ; tenfour
+	echo "(load \"$f\")" | $SBCL --eval '(load "assertoid.lisp")' ; tenfour $? $f
     fi
 done
 
@@ -110,7 +112,7 @@ for f in *.pure-cload.lisp; do
     # to LOAD them all into the same Lisp.)
     if [ -f $f ]; then
 	echo //running $f test
-	$SBCL <<EOF ; tenfour
+	$SBCL <<EOF ; tenfour $? $f
 		(compile-file "$f")
                 (progn
                   (unwind-protect
@@ -128,7 +130,7 @@ echo //running '*.impure-cload.lisp' tests
 for f in *.impure-cload.lisp; do
     if [ -f $f ]; then
 	echo //running $f test
-	$SBCL <<EOF ; tenfour
+	$SBCL <<EOF ; tenfour $? $f
 		(compile-file "$f")
                 (progn
                   (unwind-protect