diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | tests/fileName.test | 10 | ||||
| -rw-r--r-- | tests/fileSystem.test | 2 |
3 files changed, 17 insertions, 7 deletions
@@ -1,11 +1,19 @@ +2004-05-04 Jeff Hobbs <jeffh@ActiveState.com> + + * tests/fileSystem.test (filesystem-1.39): replace 'file volumes' + * tests/fileName.test (filename-12.9,10): lindex with direct C:/ + hard-coded because A:/ was being used and that is empty for most. + + * tests/winFCmd.test (winFCmd-16.12): test volumerelative $HOME + 2004-05-04 Don Porter <dgp@users.sourceforge.net> * generic/tclAlloc.c: Make sure Tclp*Alloc* routines get * generic/tclInt.h: declared in the TCL_MEM_DEBUG and * generic/tclThreadAlloc.c: TCL_THREADS configuration. [Bug 947564] - * tests/tcltest.test: Test corrections for Mac OSX. Thanks - to Steven Abner (tauvan). [Bug 947440] + * tests/tcltest.test: Test corrections for Mac OSX. Thanks + to Steven Abner (tauvan). [Bug 947440] 2004-05-04 Donal K. Fellows <donal.k.fellows@man.ac.uk> diff --git a/tests/fileName.test b/tests/fileName.test index 791b69d..ae900af 100644 --- a/tests/fileName.test +++ b/tests/fileName.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: fileName.test,v 1.40 2004/03/30 15:35:47 vincentdarley Exp $ +# RCS: @(#) $Id: fileName.test,v 1.41 2004/05/04 22:31:10 hobbs Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest @@ -1175,7 +1175,9 @@ test filename-12.8 {globbing at filesystem root} {unixOnly} { set equal } {1} test filename-12.9 {globbing at filesystem root} {winOnly} { - set dir [lindex [glob -type d [lindex [file volumes] 0]*] 0] + # Can't grab just anything from 'file volumes' because we need a dir + # that has subdirs - assume that C:/ exists across Windows machines. + set dir [lindex [glob -type d C:/*] 0] set first [string range $dir 0 3] set res1 [glob -nocomplain ${first}*] set res2 [glob -path $first *] @@ -1187,9 +1189,9 @@ test filename-12.9 {globbing at filesystem root} {winOnly} { } {1} test filename-12.10 {globbing with volume relative paths} {winOnly} { - set dir [lindex [glob -type d [lindex [file volumes] 0]*] 0] + set dir [lindex [glob -type d C:/*] 0] set pwd [pwd] - cd [lindex [file volumes] 0] + cd C:/ set res1 [glob -nocomplain [string range $dir 2 end]] cd $pwd set res2 [list $dir] diff --git a/tests/fileSystem.test b/tests/fileSystem.test index a619929..e9c4ee6 100644 --- a/tests/fileSystem.test +++ b/tests/fileSystem.test @@ -387,7 +387,7 @@ test filesystem-1.38 {file normalisation with volume relative} \ } "[lindex $drives 0]foo" test filesystem-1.39 {file normalisation with volume relative} {winOnly} { - set drv [lindex [file volumes] 0] + set drv C:/ set dir [lindex [glob -type d -dir $drv *] 0] set old [pwd] cd $dir |