X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Frun-tests.sh;h=ed1b498962383529a120cf67e3c8939ae8188e76;hb=19319c931fc1636835dbef71808cc10e252bcf45;hp=debc22ab2e1816f3ba2cd9634ccd981e383cee97;hpb=1acfa21e0796f5d72d776b0fd53645813d5f2d98;p=sbcl.git

diff --git a/tests/run-tests.sh b/tests/run-tests.sh
old mode 100644
new mode 100755
index debc22a..ed1b498
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -1,14 +1,5 @@
 #!/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,60 +11,43 @@
 # 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.
-. ../sbcl-pwd.sh
-sbcl_pwd
+if [ "$1" = "--help" ]; then
+    cat <<EOF
+Run the regression tests in this directory.
 
-SBCL_HOME=$SBCL_PWD/../contrib
-export SBCL_HOME
-sbclstem=$SBCL_PWD/../src/runtime/sbcl
+Usage: $0 [OPTIONS] [files]
 
-SBCL="$sbclstem --core $SBCL_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
-#
-# (KLUDGE: and also without any magic to suppress --userinit and
-# --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.). 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\'
+Options:
 
-LANG=C
-LC_ALL=C
-export LANG
-export LC_ALL
+  --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. 
+
+If no test files are specified, runs all tests.
+EOF
+    exit 0
+fi
+
+
+. ./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 [ $1 = 104 ]; then
+    if [ $1 = $EXIT_TEST_WIN ]; then
         echo ok
     else
-        echo test $2 failed, expected 104 return code, got $1
+        echo test failed, expected $EXIT_TEST_WIN return code, got $1
         exit 1
     fi
 }
-
-$SBCL --eval '(with-compilation-unit () (load "run-tests.lisp"))' \
-  --eval '(run-tests::run-all)' $*
+set +u
+run_sbcl \
+    --eval '(with-compilation-unit () (load "run-tests.lisp"))' \
+    --eval '(run-tests::run-all)' $*
 
 tenfour $?