X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Frun-tests.sh;h=ed1b498962383529a120cf67e3c8939ae8188e76;hb=cf49f2d086069a9c1b57f501df9a6a0bd3a34c3c;hp=541a24a0df8c4b57d4bfc9b4bad5cd6e00d88a3d;hpb=ce7ae6fa75e33b4e484ba7b4e0d79ec2b9d424fd;p=sbcl.git

diff --git a/tests/run-tests.sh b/tests/run-tests.sh
old mode 100644
new mode 100755
index 541a24a..ed1b498
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -1,142 +1,55 @@
 #!/bin/sh
 
-# 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 in the tests
-#
-# 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
-SBCL_ALLOWING_CORE=${1:-$sbclstem}
-export SBCL_ALLOWING_CORE
-echo /with SBCL_ALLOWING_CORE=\'$SBCL_ALLOWING_CORE\'
+if [ "$1" = "--help" ]; then
+    cat <<EOF
+Run the regression tests in this directory.
 
-# "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.
-# (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
-    else
-	echo test failed, expected 104 return code, got $?
-	exit 1
-    fi
-}
+Usage: $0 [OPTIONS] [files]
 
-# *.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"
-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
+Options:
 
-# *.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
-    fi
-done
+  --break-on-failure            Break into the debugger when a test fails
+                                unexpectedly
+  --break-on-expected-failure   Break into the debugger when any test fails
+  --report-skipped-tests        Include tests :skipped-on target SBCL in
+                                the test report.
+  --no-color                    Disable coloring of results. 
 
-# *.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
-    fi
-done
+If no test files are specified, runs all tests.
+EOF
+    exit 0
+fi
 
-# *.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
-    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
-                  (unwind-protect
-		  (load *)
-                   (ignore-errors (delete-file (compile-file-pathname "$f"))))
-                  (sb-ext:quit :unix-status 104))
-EOF
-    fi
-done
+. ./subr.sh
 
-# *.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
-                  (unwind-protect
-		  (load *)
-                   (ignore-errors (delete-file (compile-file-pathname "$f"))))
-                  (sb-ext:quit :unix-status 104))
-EOF
+echo /running tests on \'$SBCL_RUNTIME --core $SBCL_CORE $SBCL_ARGS\'
+
+tenfour () {
+    if [ $1 = $EXIT_TEST_WIN ]; then
+        echo ok
+    else
+        echo test failed, expected $EXIT_TEST_WIN return code, got $1
+        exit 1
     fi
-done
+}
+set +u
+run_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