X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Fside-effectful-pathnames.test.sh;h=b2236e6826d62cb1f3f415e1f6d6ae148e872c4d;hb=3106aee96a20d1a76a114e504bc2931f8196cace;hp=89fe7eab9898ce1004f6de69149b23cfb47da9c9;hpb=30d3955b07af6b6b2e52699f213e3b87b11e0f2d;p=sbcl.git

diff --git a/tests/side-effectful-pathnames.test.sh b/tests/side-effectful-pathnames.test.sh
index 89fe7ea..b2236e6 100644
--- a/tests/side-effectful-pathnames.test.sh
+++ b/tests/side-effectful-pathnames.test.sh
@@ -6,7 +6,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.
@@ -35,16 +35,14 @@ $SBCL <<EOF
     (format t "translation=~S~%" translation)
     (format t "expected-translation=~S~%" expected-translation)
     (assert (string= translation expected-translation)))
-  #| ; REMOVEME: These should be uncommented-out after flaky2_branch is merged.
   (format t "about to LOAD ~S~%" "TEST:$StudlyCapsStem")
   (load "TEST:$StudlyCapsStem")
   (assert (eq *loaded* :yes))
   (let ((compiled-file-name (namestring (compile-file "TEST:$StudlyCapsStem")))
-        (expected-file-name "$testdir/$testfilestem.x86f"))
+        (expected-file-name "$testdir/$testfilestem.fasl"))
     (format t "compiled-file-name=~S~%" compiled-file-name)
     (format t "expected-file-name=~S~%" expected-file-name)
     (assert (string= compiled-file-name expected-file-name)))
-  |#
   (sb-ext:quit :unix-status 52)
 EOF
 if [ $? != 52 ]; then
@@ -60,7 +58,7 @@ rm -r $testdir
 # was removed from UNIX-STAT. Let's make sure that it works now.
 #
 # Set up an empty directory to work with.
-testdir=$TMPDIR/sbcl-mkdir-test-$$
+testdir=${TMPDIR:-/tmp}/sbcl-mkdir-test-$$
 if ! rm -rf $testdir ; then
   echo "$testdir already exists and could not be deleted"
   exit 1;
@@ -73,8 +71,8 @@ $SBCL <<EOF
 (let ((rel-name #p"foo/bar/")
       (abs-name (merge-pathnames #p"baz/quux/" (truename "."))))
   (and
-   (ensure-directories-exist abs-name)
-   (ensure-directories-exist rel-name)
+   (equalp (ensure-directories-exist abs-name) abs-name)
+   (equalp (ensure-directories-exist rel-name) rel-name)
    (sb-ext:quit :unix-status 52)))
 EOF
 if [ $? != 52 ]; then