filesystem documentation and tests

3 files changed, 19 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index d5252f0..915f4e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2004-01-22  Vince Darley  <vincentdarley@users.sourceforge.net>
 
+	* doc/file.n: clarified documentation of 'file system' [Bug 883825]
+	* tests/fCmd.test: improved test result in failure case.
+	
+2004-01-22  Vince Darley  <vincentdarley@users.sourceforge.net>
+
 	* tests/fileSystem.test: 3 new tests
 	* generic/tclPathObj.c: fix to [Bug 879555] in file normalization. 
 	* doc/filename.n: small clarification to Windows behaviour with
diff --git a/doc/file.n b/doc/file.n
index f119a83..c6ac014 100644
--- a/doc/file.n
+++ b/doc/file.n
@@ -5,7 +5,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: file.n,v 1.27 2003/12/17 17:47:28 vincentdarley Exp $
+'\" RCS: @(#) $Id: file.n,v 1.28 2004/01/26 13:33:59 vincentdarley Exp $
 '\" 
 .so man.macros
 .TH file n 8.3 Tcl "Tcl Built-In Commands"
@@ -385,16 +385,15 @@ empty string.
 .TP
 \fBfile system \fIname\fR
 .
-Returns a list of two elements, the first of which is the name of the
-filesystem to use for the file, and the second an arbitrary string
-representing the filesystem-specific nature or type of the location
-within that filesystem.  If a filesystem only supports one type of file,
-the second element may be null.  For example the native files have a
-first element 'native', and a second element which is a platform-specific
-type name for the file's system (e.g. 'NTFS', 'FAT', etc), or possibly
-the empty string if no further information is available or if this
-is not implemented.  A generic virtual file system might return the
-list 'vfs ftp' to represent a file on a remote ftp site mounted as a
+Returns a list of one or two elements, the first of which is the name of
+the filesystem to use for the file, and the second, if given, an
+arbitrary string representing the filesystem-specific nature or type of
+the location within that filesystem.  If a filesystem only supports one
+type of file, the second element may not be supplied.  For example the
+native files have a first element 'native', and a second element which
+when given is a platform-specific type name for the file's system (e.g.
+'NTFS', 'FAT', on Windows).  A generic virtual file system might return
+the list 'vfs ftp' to represent a file on a remote ftp site mounted as a
 virtual filesystem through an extension called 'vfs'.  If the file does
 not belong to any filesystem, an error is generated.
 .TP
diff --git a/tests/fCmd.test b/tests/fCmd.test
index 79050a6..9be033c 100644
--- a/tests/fCmd.test
+++ b/tests/fCmd.test
@@ -10,7 +10,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: fCmd.test,v 1.36 2004/01/21 19:59:33 vincentdarley Exp $
+# RCS: @(#) $Id: fCmd.test,v 1.37 2004/01/26 13:33:59 vincentdarley Exp $
 #
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
@@ -2340,7 +2340,9 @@ test fCmd-28.12 {file link: cd into a link} {linkDirectory} {
     # (on windows the former, on unix the latter, I believe)
     if {([file normalize $up] != [file normalize $orig]) \
       && ([file normalize $up] != [file normalize [file dirname abc.dir]])} {
-	set res "wrong directory with 'cd $link ; cd ..'"
+	set res "wrong directory with 'cd abc.link ; cd ..': \
+	  \"[file normalize $up]\" should be \"[file normalize $orig]\" or\
+	  \"[file normalize [file dirname abc.dir]]\""
     } else {
 	set res "ok"
     }