X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Frun-tests.sh;h=0ea9c8568dab486a7c827b930c46b706313c276a;hb=a5fbc248b7513f19a31e58a591a27868f30354ef;hp=e4de8cfc81bb26f4244a84e3dff40c8a15057ac7;hpb=92f6ecdad23faf8b1677c24aa57c5eaec96d9c82;p=sbcl.git

diff --git a/tests/run-tests.sh b/tests/run-tests.sh
old mode 100644
new mode 100755
index e4de8cf..0ea9c85
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -1,6 +1,18 @@
 #!/bin/sh
 
 # Run the regression tests in this directory.
+#
+# Usage: run-tests.sh [OPTIONS] [files]
+#
+# Valid options are as follows:
+#
+#  --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.
+#
+# If no test files are specified, runs all tests.
 
 # This software is part of the SBCL system. See the README file for
 # more information.
@@ -8,76 +20,29 @@
 # 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}
+. ./subr.sh
+
+echo /running tests on \'$SBCL_RUNTIME --core $SBCL_CORE $SBCL_ARGS\'
 
-# "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
+    if [ $1 = $EXIT_TEST_WIN ]; then
+        echo ok
     else
-	echo test failed: $?
-	exit 1
+        echo test failed, expected $EXIT_TEST_WIN return code, got $1
+        exit 1
     fi
 }
+set +u
+run_sbcl \
+    --eval '(with-compilation-unit () (load "run-tests.lisp"))' \
+    --eval '(run-tests::run-all)' $*
 
-# *.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
-
-# *.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.
-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
-
-# *.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
-    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
-    fi
-done
+tenfour $?
 
 echo '//apparent success (reached end of run-tests.sh normally)'
+date