X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Frun-tests.sh;h=165afa81fea310c749f162f28bd54cb5e15f7d5d;hb=0a15b6bbf9d5d3a64b5ac08bb96b6e5ec221d2ae;hp=debc22ab2e1816f3ba2cd9634ccd981e383cee97;hpb=1acfa21e0796f5d72d776b0fd53645813d5f2d98;p=sbcl.git diff --git a/tests/run-tests.sh b/tests/run-tests.sh index debc22a..165afa8 100644 --- a/tests/run-tests.sh +++ b/tests/run-tests.sh @@ -20,60 +20,22 @@ # 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 - -SBCL_HOME=$SBCL_PWD/../contrib -export SBCL_HOME -sbclstem=$SBCL_PWD/../src/runtime/sbcl +. ./subr.sh -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\' +echo /running tests on \'$SBCL_RUNTIME --core $SBCL_CORE $SBCL_ARGS\' -LANG=C -LC_ALL=C -export LANG -export LC_ALL - -# "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 $?