From: Nikodemus S. <de...@us...> - 2009-06-16 09:42:30
|
Update of /cvsroot/sbcl/sbcl/tests In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv30949/tests Modified Files: filesys.test.sh Log Message: 1.0.29.11: one more one more DIRECTORY regressions * (DIRECTORY "X*") should not match directories with dotted names. * Get rid of the KLUDGE to make up a directory component from pathname name and type, which was a source of inconsistencies between handling files and directories. Instead make MAP-DIRECTORY :DIRECTORIES :AS-FILES map over directory entries with filename-style pathnames, which allows us to share the matching logic between the two nicely. Index: filesys.test.sh =================================================================== RCS file: /cvsroot/sbcl/sbcl/tests/filesys.test.sh,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- filesys.test.sh 15 Jun 2009 22:13:08 -0000 1.16 +++ filesys.test.sh 16 Jun 2009 09:41:54 -0000 1.17 @@ -211,6 +211,8 @@ mkdir qar touch qar/ac.txt touch qar/ac.tmp +mkdir foo.moose +touch foo.bar run_sbcl <<EOF (defun test (pattern &rest expected) (let ((wanted (sort (mapcar #'truename expected) #'string< :key #'namestring)) @@ -223,10 +225,13 @@ (test "*/*b.*" "far/ab.txt" "far/ab.tmp") (test "*a*/*.txt" "far/ab.txt" "qar/ac.txt") (test "*ar/*.txt" "far/ab.txt" "qar/ac.txt") -(test "f*.*" "far/" "foo/") +(test "f*.*" "far/" "foo/" "foo.moose/" "foo.bar") (test "f*" "far/" "foo/") (test "*r" "far/" "qar/") (test "*r.*" "far/" "qar/") +(test "f*.[mb]*" "foo.moose/" "foo.bar") +(test "f*.m*.*") +(test "f*.b*.*") (quit :unix-status $EXIT_LISP_WIN) EOF check_status_maybe_lose "DIRECTORY/PATTERNS" $? |