X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Fside-effectful-pathnames.test.sh;h=2f974e610e348c2c7c56ebe94aaa9fafea114fa2;hb=d7875c296a4988e9f27e2776237884deb1984c62;hp=4dc3d8a554d94a0d8375e7fd3bfd940eba1db256;hpb=53e7a02c819090af8e6db7e47d29cdbb5296814f;p=sbcl.git

diff --git a/tests/side-effectful-pathnames.test.sh b/tests/side-effectful-pathnames.test.sh
index 4dc3d8a..2f974e6 100644
--- a/tests/side-effectful-pathnames.test.sh
+++ b/tests/side-effectful-pathnames.test.sh
@@ -1,18 +1,30 @@
 #!/bin/sh
 
-sbcl="$1"
+# This software is part of the SBCL system. See the README file for
+# more information.
+#
+# 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.
+
+. ./subr.sh
+
+use_test_subdirectory
+testdir="`pwd -P`" # resolve symbolic links in the directory.
 
 # LOADing and COMPILEing files with logical pathnames
-testdir=`pwd`"/side-effectful-pathnames-test-$$"
 testfilestem="load-test"
 StudlyCapsStem="Load-Test"
-testfilename="$testdir/$testfilestem.lisp"
-mkdir $testdir
+testfilename="$testfilestem.lisp"
 cat >$testfilename <<EOF
   (in-package :cl-user)
   (defparameter *loaded* :yes)
 EOF
-$sbcl <<EOF
+run_sbcl <<EOF
   (in-package :cl-user)
   (setf (logical-pathname-translations "TEST")
         (list (list "**;*.*.*" "$testdir/**/*.*")))
@@ -24,20 +36,56 @@ $sbcl <<EOF
     (format t "translation=~S~%" translation)
     (format t "expected-translation=~S~%" expected-translation)
     (assert (string= translation expected-translation)))
+  (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)
+  (sb-ext:quit :unix-status $EXIT_LISP_WIN)
 EOF
-if [ $? != 52 ]; then
-    echo test failed: $?
-    exit 1
+check_status_maybe_lose "LOAD/COMPILE" $?
+
+# In the flaky1 branch, Dan Barlow pointed out that
+# ENSURE-DIRECTORIES-EXIST failed for these relative pathname
+# operations when the mysterious special case handling of "" pathnames
+# was removed from UNIX-STAT. Let's make sure that it works now.
+#
+# Set up an empty directory to work with.
+testdir="${TMPDIR:-/tmp}/sbcl-mkdir-test-$$"
+if ! rm -rf "$testdir" ; then
+  echo "$testdir already exists and could not be deleted"
+  exit 1;
 fi
-rm -r $testdir
+mkdir "$testdir"
+cd "$testdir"
+#
+# Provoke failure.
+run_sbcl <<EOF
+(let ((rel-name #p"foo/bar/")
+      (abs-name (merge-pathnames #p"baz/quux/" (truename "."))))
+  (and
+   (equalp (ensure-directories-exist abs-name) abs-name)
+   (equalp (ensure-directories-exist rel-name) rel-name)
+   (sb-ext:quit :unix-status 52)))
+EOF
+check_status_maybe_lose "ENSURE-DIRECTORIES-EXIST" $?
+if [ ! -d "$testdir/foo/bar" ] ; then
+    echo test failed: "$testdir/foo/bar" is not a directory
+    find "$testdir" -print
+    exit 1
+fi;
+if [ ! -d "$testdir/baz/quux" ] ; then
+    echo test failed: "$testdir/baz/quux" is not a directory
+    find "$testdir" -print
+    exit 1
+fi;
+#
+# We succeeded, life is good. Now we don't need the test directory
+# any more; and come back home.
+cd "$SBCL_PWD"
+rm -r "$testdir"
 
-# success
-exit 104
+exit $EXIT_TEST_WIN