commit 759b92f50704dbf337a712091a0b97a0993393c0 Author: Josh Elsasser Date: Sun Jul 11 00:54:21 2010 -0700 Some Solaris fixes. diff --git run-sbcl.sh run-sbcl.sh old mode 100644 new mode 100755 index 24c0b3d..26dc406 --- run-sbcl.sh +++ run-sbcl.sh @@ -14,15 +14,22 @@ set -e BASE=`dirname "$0"` -BASE=`readlink -f ${BASE}` +if (readlink -f "${BASE}") >/dev/null 2>&1; then + BASE=`readlink -f ${BASE}` +else + opwd=`pwd` + cd "${BASE}" + BASE=`pwd` + cd "${opwd}" +fi CORE_DEFINED=no for arg in $*; do case $arg in - (--core) + --core) CORE_DEFINED=yes ;; - (--help) + --help) echo "usage: run-sbcl.sh sbcl-options*" echo echo "Runs SBCL from the build directory or binary tarball without need for" diff --git src/runtime/runtime.c src/runtime/runtime.c index 59cead9..3480623 100644 --- src/runtime/runtime.c +++ src/runtime/runtime.c @@ -35,6 +35,7 @@ #endif #include #include +#include #if defined(SVR4) || defined(__linux__) #include diff --git tests/subr.sh tests/subr.sh index eaa86fa..75031db 100644 --- tests/subr.sh +++ tests/subr.sh @@ -32,8 +32,9 @@ SBCL_RUNTIME="$SBCL_PWD/../src/runtime/sbcl" SBCL_ARGS="--noinform --no-sysinit --no-userinit --noprint --disable-debugger" # Scripts that use these variables should quote them. -TEST_BASENAME="$(basename $0)" -TEST_FILESTEM="$(echo ${TEST_BASENAME%.sh} | sed 's/\./-/g')" +TEST_BASENAME="`basename "$0"`" +TEST_FILESTEM="`basename "${TEST_BASENAME}" | sed 's/\.sh$//'`" +TEST_FILESTEM="`echo "${TEST_FILESTEM}" | sed 's/\./-/g'`" TEST_DIRECTORY="$SBCL_PWD/$TEST_FILESTEM-$$" # "Ten four" is the closest numerical slang I can find to "OK", so