X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Frun-tests.sh;h=7e960147b54cc0667748cbdf21e3697766e82f89;hb=f0338f6fa732b21daa4405e19465bd460e0526d9;hp=809ec8fb2ab72de337e5689e676701ce8bd4aadf;hpb=d7b0817586a09ea5181c0471f56602b4e5bbeaef;p=sbcl.git

diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index 809ec8f..7e96014 100644
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -2,11 +2,28 @@
 
 # Run the regression tests in this directory.
 
+# This software is part of the SBCL system. See the README file for
+# more information.
+#
+# While most of SBCL is derived from the CMU CL system, the test
+# files (like this one) were written from scratch after the fork
+# from CMU CL.
+# 
+# This software is in the public domain and is provided with
+# absolutely no warranty. See the COPYING and CREDITS files for
+# more information.
+
 # how we invoke SBCL
-sbcl=${1:-../src/runtime/sbcl --core ../output/sbcl.core --noinform --noprint --noprogrammer}
+export SBCL="${1:-../src/runtime/sbcl --core ../output/sbcl.core --noinform --sysinit /dev/null --userinit /dev/null --noprint --noprogrammer}"
 
 # "Ten four" is the closest numerical slang I can find to "OK", so
-# it's the return value that we expect from a successful test.
+# it's the Unix status value that we expect from a successful test.
+# (Of course, zero is the usual success value, but we don't want to
+# use that because SBCL returns that by default, so we might think
+# we passed a test when in fact some error caused us to exit SBCL
+# in a weird unexpected way. In contrast, 104 is unlikely to be
+# returned unless we exit through the intended explicit "test
+# successful" path.
 tenfour () {
     if [ $? = 104 ]; then
 	echo ok
@@ -20,34 +37,38 @@ tenfour () {
 # and we can run them all in a single Lisp process.
 echo //running '*.pure.lisp' tests
 echo //i.e. *.pure.lisp
-(for f in *.pure.lisp; do
-    echo "(progn"
+(
+echo "(progn"
+for f in *.pure.lisp; do
     if [ -f $f ]; then
         echo "  (progn (format t \"//running $f test~%\") (load \"$f\"))"
     fi
-    echo "  (sb-ext:quit :unix-status 104))"
-done) | $sbcl ; tenfour
+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
         echo //running $f test
-        echo "(load \"$f\")" | $sbcl ; tenfour
+        echo "(load \"$f\")" | $SBCL ; tenfour
     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
 
@@ -57,6 +78,43 @@ 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
+    fi
+done
+
+# *.pure-cload.lisp files want to be compiled, then loaded. They 
+# 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
+		(compile-file "$f")
+		(progn (load *) (sb-ext:quit :unix-status 104))
+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)'