X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Frun-tests.sh;h=3a4d2831239c4943fe23feaaff17cfea868489a4;hb=50f728671defadb8f7b1e8691c984cb0e6aba17c;hp=38700c7603ec171723d0b901411036e883f700ff;hpb=c8322df812da6eb4ef1ae51735b224b2ad0f1503;p=sbcl.git

diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index 38700c7..3a4d283 100644
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -14,8 +14,26 @@
 # more information.
 
 # how we invoke SBCL in the tests
-export SBCL="${1:-../src/runtime/sbcl --core ../output/sbcl.core --noinform --sysinit /dev/null --userinit /dev/null --noprint --noprogrammer}"
+#
+# Until sbcl-0.6.12.8, the shell variable SBCL was bound to a relative
+# pathname, but now we take care to bind it to an absolute pathname (still
+# 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}"
+export SBCL
 echo /running tests on SBCL=\'$SBCL\'
+# more or less like SBCL, but without enough grot removed that appending
+# a --core command line argument works
+#
+# (KLUDGE: and also without any magic to suppress --userinit and
+# --sysinit, so if you use it in a test, you need to add those
+# yourself if you want things to be clean. If many tests start using
+# this, we can redo it as a shell function or something so that the
+# magic can be done once and only once.)
+SBCL_ALLOWING_CORE=${1:-$sbclstem}
+export SBCL_ALLOWING_CORE
+echo /with SBCL_ALLOWING_CORE=\'$SBCL_ALLOWING_CORE\'
 
 # "Ten four" is the closest numerical slang I can find to "OK", so
 # it's the Unix status value that we expect from a successful test.
@@ -29,7 +47,7 @@ tenfour () {
     if [ $? = 104 ]; then
 	echo ok
     else
-	echo test failed: $?
+	echo test failed, expected 104 return code, got $?
 	exit 1
     fi
 }
@@ -40,6 +58,8 @@ 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\"))"
@@ -94,7 +114,11 @@ for f in *.pure-cload.lisp; do
 	echo //running $f test
 	$SBCL <<EOF ; tenfour
 		(compile-file "$f")
-		(progn (load *) (sb-ext:quit :unix-status 104))
+                (progn
+                  (unwind-protect
+		  (load *)
+                   (ignore-errors (delete-file (compile-file-pathname "$f"))))
+                  (sb-ext:quit :unix-status 104))
 EOF
     fi
 done
@@ -108,7 +132,11 @@ for f in *.impure-cload.lisp; do
 	echo //running $f test
 	$SBCL <<EOF ; tenfour
 		(compile-file "$f")
-		(progn (load *) (sb-ext:quit :unix-status 104))
+                (progn
+                  (unwind-protect
+		  (load *)
+                   (ignore-errors (delete-file (compile-file-pathname "$f"))))
+                  (sb-ext:quit :unix-status 104))
 EOF
     fi
 done
@@ -119,3 +147,4 @@ done
 # work.)
 
 echo '//apparent success (reached end of run-tests.sh normally)'
+date