X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Fsubr.sh;h=b96dd29bd3ea2b2302039ac7b958db8fb62eb7ba;hb=ee5629ee974ee8ce7a1cb245a99e94f8943ffd90;hp=c0e67f8e1288449110819659deca46b7df6ad04b;hpb=dca20740848a3e316371460a25be29fd574850ed;p=sbcl.git

diff --git a/tests/subr.sh b/tests/subr.sh
index c0e67f8..b96dd29 100644
--- a/tests/subr.sh
+++ b/tests/subr.sh
@@ -33,7 +33,8 @@ 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_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
@@ -118,6 +119,10 @@ check_status_maybe_lose () {
 # them consistently do so in subdirectories.  Note that such tests
 # should not change their exit action, or do so only very carefully.
 use_test_subdirectory () {
+    if test -d "$TEST_DIRECTORY"
+    then
+        cleanup_test_subdirectory
+    fi
     mkdir "$TEST_DIRECTORY"
     cd "$TEST_DIRECTORY"
     trap "cleanup_test_subdirectory" EXIT