X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Frun-tests.sh;h=7eeaf5154d66c6c521d5235f39f1db7b75782e5e;hb=6c765578c8dc4bcc7798e37c9918715f198b30da;hp=90e758132bfcc006359147a287a544c99e516bdf;hpb=4a4f1e5ca70363d64d7cbb141863a387334e6760;p=sbcl.git

diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index 90e7581..7eeaf51 100644
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -47,9 +47,11 @@ done
 echo "  (sb-ext:quit :unix-status 104)) ; Return status=success."
 ) | $sbcl ; tenfour
 
-# *.impure.lisp files are Lisp code with side effects (e.g. doing DEFSTRUCT
-# or DEFTYPE or DEFVAR). Each one needs to be run as a separate
-# invocation of Lisp.
+# *.impure.lisp files are Lisp code with side effects (e.g. doing
+# DEFSTRUCT or DEFTYPE or DEFVAR, or messing with the read table).
+# Each one should be LOADed in a separate invocation of Lisp, so 
+# that we don't need to worry about them interfering with each
+# other.
 echo //running '*.impure.lisp' tests
 for f in *.impure.lisp; do
     if [ -f $f ]; then
@@ -58,15 +60,15 @@ for f in *.impure.lisp; do
     fi
 done
 
-# *.test.sh files are scripts to test stuff, typically stuff which can't
-# so easily be tested within Lisp itself. A file foo.test.sh
+# *.test.sh files are scripts to test stuff, typically stuff which 
+# can't so easily be tested within Lisp itself. A file foo.test.sh
 # may be associated with other files foo*, e.g. foo.lisp, foo-1.lisp,
 # or foo.pl.
 echo //running '*.test.sh' tests
 for f in *.test.sh; do
     if [ -f $f ]; then
 	echo //running $f test
-	sh $f ; tenfour
+	sh $f "$sbcl"; tenfour
     fi
 done
 
@@ -84,6 +86,9 @@ done
 # can all be done in the same invocation of Lisp.
 echo //running '*.pure-cload.lisp' tests
 for f in *.pure-cload.lisp; do
+    # (Actually here we LOAD each one into a separate invocation
+    # of Lisp just because I haven't figured out a concise way
+    # to LOAD them all into the same Lisp.)
     if [ -f $f ]; then
 	echo //running $f test
 	$sbcl <<EOF ; tenfour
@@ -93,4 +98,23 @@ EOF
     fi
 done
 
+# *.impure-cload.lisp files want to be compiled, then loaded. They
+# can have side effects, so each one should be done in a separate
+# invocation of Lisp so that they don't interfere.
+echo //running '*.impure-cload.lisp' tests
+for f in *.impure-cload.lisp; do
+    if [ -f $f ]; then
+	echo //running $f test
+	$sbcl <<EOF ; tenfour
+		(compile-file "$f")
+		(progn (load *) (sb-ext:quit :unix-status 104))
+EOF
+    fi
+done
+
+# (*.before-xc.lisp and *.after-xc.lisp files aren't handled in this
+# script at all. They're tests intended to run in the cross-compiler,
+# so that some functionality can be tested even when cold init doesn't
+# work.)
+
 echo '//apparent success (reached end of run-tests.sh normally)'