X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Ffilesys.test.sh;h=77aff659a40dc64d2d19f0e186b8a32b7a0698e5;hb=6596b18b95780986ff4eb511ab384da138adbb58;hp=68401816de1da186f24d103b9f2cdc8661e0417c;hpb=ec0e9da75fd4ca7206df53854c4ab74713b1ef05;p=sbcl.git

diff --git a/tests/filesys.test.sh b/tests/filesys.test.sh
index 6840181..77aff65 100644
--- a/tests/filesys.test.sh
+++ b/tests/filesys.test.sh
@@ -219,12 +219,15 @@ touch qar/ac.tmp
 mkdir foo.moose
 touch foo.bar
 run_sbcl <<EOF
+(setf (logical-pathname-translations "foo")
+      (list (list "**;*.txt.*" (merge-pathnames "foo/**/*.txt"))
+            (list "**;*.*.*" (merge-pathnames "**/*.*"))))
+
 (defun test (pattern &rest expected)
   (let ((wanted (sort (mapcar #'truename expected) #'string< :key #'namestring))
         (got (sort (directory pattern) #'string< :key #'namestring)))
     (unless (equal wanted got)
-      (format t "wanted:~%  ~Sgot:~%  ~S" wanted got)
-      (error "wanted:~%  ~Sgot:~%  ~S" wanted got))))                 
+      (error "wanted:~%  ~S~%got:~%  ~S" wanted got))))
 (test "*/a*.txt" "foo/aa.txt" "far/ab.txt" "qar/ac.txt")
 (test "fo*/a*.t*" "foo/aa.txt" "foo/aa.tmp")
 (test "*/*b.*" "far/ab.txt" "far/ab.tmp")
@@ -240,6 +243,11 @@ run_sbcl <<EOF
 (test "*/x" "foo/x/" "far/x/")
 (test "far/*/x" "far/y/x/" "far/x/x/")
 (test "**/x/" "foo/x/" "far/x/" "far/x/x" "far/y/x/")
+(test "foo:*.txt" "foo/aa.txt")
+(test "foo:far;*.txt" "far/ab.txt")
+(test "foo:foo;*.txt" "foo/aa.txt")
+(test "foo:**;*.tmp" "foo/aa.tmp" "far/ab.tmp" "qar/ac.tmp")
+(test "foo:foo;*.tmp" "foo/aa.tmp")
 (quit :unix-status $EXIT_LISP_WIN)
 EOF
 check_status_maybe_lose "DIRECTORY/PATTERNS" $?
@@ -278,23 +286,23 @@ run_sbcl --eval '(sb-ext:delete-directory "simple_test_subdir1")' \
          --eval '(sb-ext:delete-directory "deep" :recursive t)' \
          --eval '(sb-ext:quit)'
 
-test -e simple_test_subdir1
+test -d simple_test_subdir1
 check_status_maybe_lose "delete-directory 1" $? \
   1 "deleted"
 
-test -e simple_test_subdir2
+test -d simple_test_subdir2
 check_status_maybe_lose "delete-directory 2" $? \
   1 "deleted"
 
-test -e deep
+test -d deep
 check_status_maybe_lose "delete-directory 3" $? \
   1 "deleted"
 
-test -e dont_delete_me
+test -d dont_delete_me
 check_status_maybe_lose "delete-directory 4" $? \
   0 "didn't follow link"
 
-test -e me_neither
+test -f me_neither
 check_status_maybe_lose "delete-directory 5" $? \
   0 "didn't follow link"