From 4afcad784283623d52b8723c1706b53d784c3053 Mon Sep 17 00:00:00 2001
From: Jim Wise <jwise@draga.com>
Date: Sun, 13 Oct 2013 17:22:19 -0400
Subject: [PATCH] Fix on Solaris by accounting for /bin/sh there.
Solaris' /bin/sh does not grok $(...), so use `...` instead.
Note that all recent versions of Solaris have included /bin/bash, but
I'm not sure the impact of using #!/bin/bash instead of #!/bin/sh on
some of our other platforms.
---
tests/script.test.sh | 2 +-
tests/subr.sh | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/tests/script.test.sh b/tests/script.test.sh
index 6adfcf0..b209d96 100644
--- a/tests/script.test.sh
+++ b/tests/script.test.sh
@@ -114,7 +114,7 @@ fi
echo '(format t "Hello, Fasl~%")' > $tmpscript
run_sbcl --eval "(compile-file \"$tmpscript\" :output-file \"$tmpfasl\")" </dev/null >/dev/null
chmod +x $tmpfasl
-SBCL_HOME=$(dirname $SBCL_CORE) ./$tmpfasl >$tmpout 2>$tmperr
+SBCL_HOME=`dirname $SBCL_CORE` ./$tmpfasl >$tmpout 2>$tmperr
check_status_maybe_lose "--script exit status from fasl" $? 0 "(ok)"
if [ -s $tmperr ] || [ "Hello, Fasl" != "`cat $tmpout`" ]
then
diff --git a/tests/subr.sh b/tests/subr.sh
index 2b63144..c1c5d49 100644
--- a/tests/subr.sh
+++ b/tests/subr.sh
@@ -32,8 +32,8 @@ SBCL_RUNTIME="${TEST_SBCL_RUNTIME:-$SBCL_PWD/../src/runtime/sbcl}"
SBCL_ARGS="${TEST_SBCL_ARGS:---noinform --no-sysinit --no-userinit --noprint --disable-debugger}"
# Scripts that use these variables should quote them.
-TEST_BASENAME="`basename $0`"
-TEST_FILESTEM="$(basename "${TEST_BASENAME}" | sed -e 's/\.sh$//' -e 's/\./-/g')"
+TEST_BASENAME=`basename $0`
+TEST_FILESTEM=`basename "${TEST_BASENAME}" | sed -e 's/\.sh$//' -e 's/\./-/g'`
: ${TEST_BASEDIR:="$SBCL_PWD"}
TEST_DIRECTORY="${TEST_BASEDIR}/${TEST_FILESTEM}-$$"
export TEST_DIRECTORY
--
1.7.10.4