summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin B Kenny <kennykb@acm.org>2009-10-28 16:45:51 (GMT)
committerKevin B Kenny <kennykb@acm.org>2009-10-28 16:45:51 (GMT)
commitcf3b90a2ccebaba6be1c6ea1a6a6de8a3214c8a5 (patch)
tree52cca34c50181b1641ebe9d36509f526d3dddebf
parent1268a25362d8b84daac84c8010a50da1711094e2 (diff)
downloadtcl-cf3b90a2ccebaba6be1c6ea1a6a6de8a3214c8a5.zip
tcl-cf3b90a2ccebaba6be1c6ea1a6a6de8a3214c8a5.tar.gz
tcl-cf3b90a2ccebaba6be1c6ea1a6a6de8a3214c8a5.tar.bz2
* tests/fileName.test (fileName-20.[78]): Corrected poor test
hygiene (failure to save and restore the working directory) that caused these two tests to fail on Windows (and [Bug 2806250] to be reopened).
-rw-r--r--ChangeLog7
-rw-r--r--tests/fileName.test13
2 files changed, 19 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1b46d53..033471d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-10-28 Kevin B. Kenny <kennykb@acm.org>
+
+ * tests/fileName.test (fileName-20.[78]): Corrected poor test
+ hygiene (failure to save and restore the working directory) that
+ caused these two tests to fail on Windows (and [Bug 2806250]
+ to be reopened).
+
2009-10-27 Don Porter <dgp@users.sourceforge.net>
* generic/tclPathObj.c: Missing refcount on cached normalized path
diff --git a/tests/fileName.test b/tests/fileName.test
index 8986cc2..9fe9f34 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.51.8.9 2009/08/21 18:31:37 dgp Exp $
+# RCS: @(#) $Id: fileName.test,v 1.51.8.10 2009/10/28 16:45:54 kennykb Exp $
if {[lsearch [namespace children] ::tcltest] == -1} {
package require tcltest
@@ -1513,6 +1513,11 @@ test filename-16.17 {windows specific globbing} {win} {
}
} {ok}
+# Put the working directory back now that we're done with globbing in C:/
+if {[testConstraint win]} {
+ cd $oldDir
+}
+
test filename-17.1 {windows specific special files} {testsetplatform} {
testsetplatform win
list [file pathtype com1] [file pathtype con] [file pathtype lpt3] \
@@ -1623,6 +1628,8 @@ test fileName-20.6 {Bug 2837800} -setup {
} -result {}
test fileName-20.7 {Bug 2806250} -setup {
+ set savewd [pwd]
+ cd [temporaryDirectory]
set d [makeDirectory isolate]
makeFile {} ./~test $d
} -body {
@@ -1630,9 +1637,12 @@ test fileName-20.7 {Bug 2806250} -setup {
} -cleanup {
removeFile ./~test $d
removeDirectory isolate
+ cd $savewd
} -result 1
test fileName-20.8 {Bug 2806250} -setup {
+ set savewd [pwd]
+ cd [temporaryDirectory]
set d [makeDirectory isolate]
makeFile {} ./~test $d
} -body {
@@ -1640,6 +1650,7 @@ test fileName-20.8 {Bug 2806250} -setup {
} -cleanup {
removeFile ./~test $d
removeDirectory isolate
+ cd $savewd
} -result ./~test
test fileName-20.9 {} -setup {