summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--tests/fileName.test6
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d034205..7632d76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-05-04 Jeff Hobbs <jeffh@ActiveState.com>
+
+ * tests/fileName.test (filename-12.9): use C:/ instead of the
+ first item in file volumes - that's usually A:/, which for most
+ will have nothing in it.
+
2004-05-04 Don Porter <dgp@users.sourceforge.net>
* tests/tcltest.test: Test corrections for Mac OSX. Thanks
diff --git a/tests/fileName.test b/tests/fileName.test
index db431fc..19b08ec 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.30.2.4 2004/03/09 12:56:59 vincentdarley Exp $
+# RCS: @(#) $Id: fileName.test,v 1.30.2.5 2004/05/04 22:12:49 hobbs Exp $
if {[lsearch [namespace children] ::tcltest] == -1} {
package require tcltest
@@ -1669,7 +1669,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 *]