X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Frun-tests.sh;h=08f5665eb08d4ae4c932822066bcbac4b86e76ff;hb=2b5f0aca85a1c61eba7eefab0bb286d98605f680;hp=89bdaaa03e9bfdd02da29d158888ea85af56365b;hpb=3fe0010d2777b41e01ea9b4a0f894cfa40f7df1b;p=sbcl.git

diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index 89bdaaa..08f5665 100644
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -1,6 +1,13 @@
 #!/bin/sh
 
 # Run the regression tests in this directory.
+#
+# Usage: run-tests.sh [--break-on-failure] [--break-on-expected-failure] [files]
+#  --break-on-failure            Break into the debugger when a test fails
+#                                unexpectedly
+#  --break-on-expected-failure   Break into the debugger when any test fails
+#  
+# If no test files are specified, runs all tests.
 
 # This software is part of the SBCL system. See the README file for
 # more information.
@@ -20,7 +27,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="$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
@@ -30,8 +37,10 @@ echo /running tests on SBCL=\'$SBCL\'
 # --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}
+# magic can be done once and only once.). Not used in this file, but
+# exists for the benefit of the *.test.sh files that can be started by
+# run-tests.lisp
+SBCL_ALLOWING_CORE=$sbclstem
 export SBCL_ALLOWING_CORE
 echo /with SBCL_ALLOWING_CORE=\'$SBCL_ALLOWING_CORE\'
 
@@ -50,106 +59,17 @@ export LC_ALL
 # successful" path.
 tenfour () {
     if [ $1 = 104 ]; then
-	echo ok
+        echo ok
     else
-	echo test $2 failed, expected 104 return code, got $1
-	exit 1
+        echo test $2 failed, expected 104 return code, got $1
+        exit 1
     fi
 }
 
-# *.pure.lisp files are ordinary Lisp code with no side effects,
-# and we can run them all in a single Lisp process.
-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 $? "(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).
-# 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 $? $f
-    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
-# 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 "$SBCL"; tenfour $? $f
-    fi
-done
-
-# *.assertoids files contain ASSERTOID statements to test things
-# interpreted and at various compilation levels.
-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 $? $f
-    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 $? $f
-		(compile-file "$f")
-                (progn
-                  (unwind-protect
-		  (load *)
-                   (ignore-errors (delete-file (compile-file-pathname "$f"))))
-                  (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 $? $f
-		(compile-file "$f")
-                (progn
-                  (unwind-protect
-		  (load *)
-                   (ignore-errors (delete-file (compile-file-pathname "$f"))))
-                  (sb-ext:quit :unix-status 104))
-EOF
-    fi
-done
+$SBCL --eval '(with-compilation-unit () (load "run-tests.lisp"))' \
+  --eval '(run-tests::run-all)' $*
 
-# (*.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.)
+tenfour $?
 
 echo '//apparent success (reached end of run-tests.sh normally)'
 date