summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvincentdarley <vincentdarley>2005-01-17 13:04:28 (GMT)
committervincentdarley <vincentdarley>2005-01-17 13:04:28 (GMT)
commit2c8e4f5d2d76cd74310a79a3cdb91ca6920ccbb9 (patch)
treeaa24f867122359aac04dec63d52b605830f275d7
parent6dd9ce45620382f3a06d1540ed2c08f4c88ad00a (diff)
downloadtcl-2c8e4f5d2d76cd74310a79a3cdb91ca6920ccbb9.zip
tcl-2c8e4f5d2d76cd74310a79a3cdb91ca6920ccbb9.tar.gz
tcl-2c8e4f5d2d76cd74310a79a3cdb91ca6920ccbb9.tar.bz2
fix to drive-sensitivity of test
-rw-r--r--ChangeLog5
-rw-r--r--tests/winFCmd.test8
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 65efd31..b99de5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-17 Vince Darley <vincentdarley@users.sourceforge.net>
+
+ * tests/winFCmd.test: made test independent of current drive.
+ [Bug 1066528]
+
2005-01-10 Donal K. Fellows <donal.k.fellows@man.ac.uk>
* unix/tclUnixFCmd.c (CopyFile): Convert u_int to unsigned
diff --git a/tests/winFCmd.test b/tests/winFCmd.test
index a8a05c4..49bae98 100644
--- a/tests/winFCmd.test
+++ b/tests/winFCmd.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: winFCmd.test,v 1.20.2.5 2004/05/25 19:02:28 kennykb Exp $
+# RCS: @(#) $Id: winFCmd.test,v 1.20.2.6 2005/01/17 13:04:44 vincentdarley Exp $
#
if {[lsearch [namespace children] ::tcltest] == -1} {
@@ -592,8 +592,10 @@ test winFCmd-6.11 {TclpRemoveDirectory: attr == -1} {pcOnly nt} {
set res [list [catch {testfile rmdir /} msg] $msg]
# WinXP returns EEXIST, WinNT seems to return EACCES. No policy
# decision has been made as to which is correct.
- regsub {E(ACCES|EXIST)} $res "EACCES or EEXIST"
-} {1 {C:/ EACCES or EEXIST}}
+ regsub {E(ACCES|EXIST)} $res "EACCES or EEXIST" res
+ # Don't mind which drive we're on
+ regsub {[A-Z]:} $res ""
+} {1 {/ EACCES or EEXIST}}
test winFCmd-6.12 {TclpRemoveDirectory: errno == EACCES} {pcOnly 95} {
cleanup
createfile tf1