1.0.4.29: Update expected test status on FreeBSD

[sbcl.git] / tests / run-tests.sh

diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index 14e8488..debc22a 100644 (file)
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -6,7 +6,7 @@
 #  --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
@@ -15,7 +15,7 @@
 # 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.
@@ -26,8 +26,14 @@
 # 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="$sbclstem --core `pwd`/../output/sbcl.core --noinform --sysinit /dev/null --userinit /dev/null --noprint --disable-debugger"
+. ../sbcl-pwd.sh
+sbcl_pwd
+
+SBCL_HOME=$SBCL_PWD/../contrib
+export SBCL_HOME
+sbclstem=$SBCL_PWD/../src/runtime/sbcl
+
+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
@@ -40,7 +46,7 @@ echo /running tests on SBCL=\'$SBCL\'
 # 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=${1:-$sbclstem}
+SBCL_ALLOWING_CORE=$sbclstem
 export SBCL_ALLOWING_CORE
 echo /with SBCL_ALLOWING_CORE=\'$SBCL_ALLOWING_CORE\'