X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Ffilesys.test.sh;h=9b720a91b8aa9101f44657450f73600f37a47f5b;hb=6db5731e2db2d90cc3a6996a310dbf248ad9aebb;hp=76f633838e31c7d588bfc400deab17bfc264579f;hpb=f369c736b57608402903ce5c59be78a87ef23364;p=sbcl.git

diff --git a/tests/filesys.test.sh b/tests/filesys.test.sh
index 76f6338..9b720a9 100644
--- a/tests/filesys.test.sh
+++ b/tests/filesys.test.sh
@@ -6,35 +6,44 @@
 # 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.
+
+set -f # disable filename expansion in the shell.
+
 # Test DIRECTORY and TRUENAME.
-testdir=`/bin/pwd`"/filesys-test-$$"
-mkdir $testdir
-echo this is a test > $testdir/test-1.tmp
-echo this is a test > $testdir/test-2.tmp
-echo this is a test > $testdir/wild\?test.tmp
-cd $testdir
-ln -s $testdir dirlinktest
+echo this is a test > test-1.tmp
+echo this is a test > test-2.tmp
+echo this is a test > wild?test.tmp
+
+ln -s "$testdir" dirlinktest
 ln -s test-1.tmp link-1
-ln -s `pwd`/test-2.tmp link-2
+ln -s "$testdir/test-2.tmp" link-2
 ln -s i-do-not-exist link-3
 ln -s link-4 link-4
 ln -s link-5 link-6
-ln -s `pwd`/link-6 link-5
-expected_truenames=\
-"'(#p\"$testdir/\"\
-   #p\"$testdir/link-3\"\
-   #p\"$testdir/link-4\"\
-   #p\"$testdir/link-5\"\
-   #p\"$testdir/link-6\"\
-   #p\"$testdir/test-1.tmp\"\
-   #p\"$testdir/test-2.tmp\"\
-   #p\"$testdir/wild\\\\?test.tmp\")"
-$SBCL <<EOF
+ln -s "$testdir/link-6" link-5
+expected_truenames=`cat<<EOF
+(list #p"$testdir/"
+      #p"$testdir/link-3"
+      #p"$testdir/link-4"
+      #p"$testdir/link-5"
+      #p"$testdir/link-6"
+      #p"$testdir/test-1.tmp"
+      #p"$testdir/test-2.tmp"
+      #p"$testdir/wild\\\\\?test.tmp")
+EOF
+`
+# FIXME: the following tests probably can't succeed at all if the
+# testdir name contains wildcard characters or quotes.
+run_sbcl <<EOF
   (in-package :cl-user)
   (let* ((directory (directory "./*.*"))
          (truenames (sort directory #'string< :key #'pathname-name)))
@@ -50,14 +59,12 @@ $SBCL <<EOF
   (assert (equal (truename "link-4")     #p"$testdir/link-4"))
   (assert (equal (truename "link-5")     #p"$testdir/link-5"))
   (assert (equal (truename "link-6")     #p"$testdir/link-6"))
-  (sb-ext:quit :unix-status 52)
+  (sb-ext:quit :unix-status $EXIT_LISP_WIN)
 EOF
-if [ $? != 52 ]; then
-    echo DIRECTORY/TRUENAME test part 1 failed, unexpected SBCL return code=$?
-    exit 1
-fi
-cd ..
-$SBCL <<EOF
+check_status_maybe_lose "DIRECTORY/TRUENAME part 1" $?
+
+cd "$SBCL_PWD"
+run_sbcl <<EOF
   (in-package :cl-user)
   (let* ((directory (directory "$testdir/*.*"))
          (truenames (sort directory #'string< :key #'pathname-name)))
@@ -71,17 +78,14 @@ $SBCL <<EOF
   (assert (equal (truename "$testdir/link-4")     #p"$testdir/link-4"))
   (assert (equal (truename "$testdir/link-5")     #p"$testdir/link-5"))
   (assert (equal (truename "$testdir/link-6")     #p"$testdir/link-6"))
-  (sb-ext:quit :unix-status 52)
+  (sb-ext:quit :unix-status $EXIT_LISP_WIN)
 EOF
-if [ $? != 52 ]; then
-    echo DIRECTORY/TRUENAME test part 2 failed, unexpected SBCL return code=$?
-    exit 1
-fi
-rm -r $testdir
+check_status_maybe_lose "DIRECTORY/TRUENAME part 2" $?
+cleanup_test_subdirectory
 
 # Test DIRECTORY on a tree structure of directories.
-mkdir $testdir
-cd $testdir
+use_test_subdirectory
+
 touch water dirt
 mkdir animal plant
 mkdir animal/vertebrate animal/invertebrate
@@ -104,33 +108,33 @@ touch animal/vertebrate/mammal/rodent/rat
 touch animal/vertebrate/mammal/ruminant/cow
 touch animal/vertebrate/snake/python
 touch plant/kingsfoil plant/pipeweed
-$SBCL <<EOF
+run_sbcl <<EOF
 (in-package :cl-user)
 (defun absolutify (pathname)
   "Convert a possibly-relative pathname to absolute."
   (merge-pathnames pathname
-		   (make-pathname :directory
-				  (pathname-directory
-				   *default-pathname-defaults*))))
+                   (make-pathname :directory
+                                  (pathname-directory
+                                   *default-pathname-defaults*))))
 (defun sorted-truenamestrings (pathname-designators)
   "Convert a collection of pathname designators into canonical form
 using TRUENAME, NAMESTRING, and SORT."
   (sort (mapcar #'namestring
-		(mapcar #'truename
-			pathname-designators))
-	#'string<))
+                (mapcar #'truename
+                        pathname-designators))
+        #'string<))
 (defun need-match-1 (directory-pathname result-sorted-truenamestrings)
   "guts of NEED-MATCH"
   (let ((directory-sorted-truenamestrings (sorted-truenamestrings
-					   (directory directory-pathname))))
+                                           (directory directory-pathname))))
     (unless (equal directory-sorted-truenamestrings
-		   result-sorted-truenamestrings)
+                   result-sorted-truenamestrings)
       (format t "~&~@<DIRECTORY argument = ~_~2I~S~:>~%"
-	      directory-pathname)
+              directory-pathname)
       (format t "~&~@<DIRECTORY result = ~_~2I~S~:>~%"
-	      directory-sorted-truenamestrings)
+              directory-sorted-truenamestrings)
       (format t "~&~@<expected result = ~_~2I~S.~:>~%"
-	      result-sorted-truenamestrings)
+              result-sorted-truenamestrings)
       (error "mismatch between DIRECTORY and expected result"))))
 (defun need-match (directory-pathname result-pathnames)
   "Require that (DIRECTORY DIRECTORY-PATHNAME) return RESULT-PATHNAMES
@@ -156,48 +160,56 @@ Lisp filename syntax idiosyncrasies)."
   (need-match "./animal" '("animal/"))
   (need-match "animal/*.*" '("animal/invertebrate/" "animal/vertebrate/"))
   (need-match "animal/*/*.*"
-	      '("animal/vertebrate/bird/"
-		"animal/vertebrate/mammal/"
-		"animal/vertebrate/snake/"))
+              '("animal/vertebrate/bird/"
+                "animal/vertebrate/mammal/"
+                "animal/vertebrate/snake/"))
   (need-match "plant/*.*" '("plant/kingsfoil" "plant/pipeweed"))
   (need-match "plant/**/*.*" '("plant/kingsfoil" "plant/pipeweed"))
   (need-match "plant/**/**/*.*" '("plant/kingsfoil" "plant/pipeweed"))
   (let ((vertebrates (mapcar (lambda (stem)
-			       (concatenate 'string
-					    "animal/vertebrate/"
-					    stem))
-			     '("bird/"
-			       "mammal/"
-			       "mammal/bear/" "mammal/bear/grizzly"
-			       "mammal/mythical/" "mammal/mythical/mermaid"
-			       "mammal/mythical/unicorn"
-			       "mammal/platypus"
-			       "mammal/rodent/" "mammal/rodent/beaver"
-			       "mammal/rodent/mouse" "mammal/rodent/rabbit"
-			       "mammal/rodent/rat"
-			       "mammal/ruminant/" "mammal/ruminant/cow"
-			       "mammal/walrus"
-			       "snake/" "snake/python"))))
+                               (concatenate 'string
+                                            "animal/vertebrate/"
+                                            stem))
+                             '("bird/"
+                               "mammal/"
+                               "mammal/bear/" "mammal/bear/grizzly"
+                               "mammal/mythical/" "mammal/mythical/mermaid"
+                               "mammal/mythical/unicorn"
+                               "mammal/platypus"
+                               "mammal/rodent/" "mammal/rodent/beaver"
+                               "mammal/rodent/mouse" "mammal/rodent/rabbit"
+                               "mammal/rodent/rat"
+                               "mammal/ruminant/" "mammal/ruminant/cow"
+                               "mammal/walrus"
+                               "snake/" "snake/python"))))
     (need-match "animal/vertebrate/**/*.*" vertebrates)
     (need-match "animal/vertebrate/mammal/../**/*.*" vertebrates)
     (need-match "animal/vertebrate/mammal/../**/**/*.*" vertebrates)
     #+nil
     (need-match "animal/vertebrate/mammal/mythical/../**/../**/*.*"
-		vertebrates))
+                vertebrates))
   (need-match "animal/vertebrate/**/robot.*" nil)
   (need-match "animal/vertebrate/mammal/../**/*.robot" nil)
   (need-match "animal/vertebrate/mammal/../**/robot/*.*" nil)
   #+nil
   (need-match "animal/vertebrate/mammal/robot/../**/../**/*.*" nil))
 (need-matches)
-(sb-ext:quit :unix-status 52)
+(sb-ext:quit :unix-status $EXIT_LISP_WIN)
 EOF
-if [ $? != 52 ]; then
-    echo DIRECTORY/TRUENAME test part 1 failed, unexpected SBCL return code=$?
-    exit 1
-fi
-cd ..
-rm -r $testdir
+check_status_maybe_lose "DIRECTORY/TRUENAME part 3" $?
+
+# Test whether ENSURE-DIRECTORIES-EXIST can create a directory whose
+# name contains a wildcard character (it used to get itself confused
+# internally).
+run_sbcl --eval '(ensure-directories-exist "foo\\*bar/baz.txt")' --eval '(sb-ext:quit)'
+test -d foo*bar
+check_status_maybe_lose "ENSURE-DIRECTORIES-EXIST part 1" $? \
+    0 "(directory exists)"
+
+run_sbcl --eval '(ensure-directories-exist "foo\\?bar/baz.txt")' --eval '(sb-ext:quit)'
+test -d foo?bar
+check_status_maybe_lose "ENSURE-DIRECTORIES-EXIST part 2" $? \
+    0 "(directory exists)"
 
 # success convention for script
-exit 104
+exit $EXIT_TEST_WIN