From 2b5867cf5037ab6d12b243adf9a162c045f8a645 Mon Sep 17 00:00:00 2001
From: hobbs <hobbs>
Date: Fri, 29 Sep 2000 01:12:14 +0000
Subject: * tests/fCmd.test (fCmd-6.20): corrected test to remove
c:/tcl8975@ after creating it.
* tests/fileName.test: cleaned up the testing of glob patterns for
c:/globTest (Windows) to directly create/remove directory.
---
tests/fCmd.test | 7 ++++---
tests/fileName.test | 38 +++++++-------------------------------
2 files changed, 11 insertions(+), 34 deletions(-)
diff --git a/tests/fCmd.test b/tests/fCmd.test
index c6cf426..2e8d383 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.8 2000/04/10 17:18:59 ericm Exp $
+# RCS: @(#) $Id: fCmd.test,v 1.9 2000/09/29 01:12:14 hobbs Exp $
#
if {[lsearch [namespace children] ::tcltest] == -1} {
@@ -509,12 +509,13 @@ test fCmd-6.20 {CopyRenameOneFile: errno == EXDEV} {pcOnly} {
catch {file delete -force c:/tcl8975@ d:/tcl8975@}
file mkdir c:/tcl8975@
if [catch {file rename c:/tcl8975@ d:/}] {
- list d:/tcl8975@
+ set msg d:/tcl8975@
} else {
set msg [glob c:/tcl8975@ d:/tcl8975@]
file delete -force d:/tcl8975@
- set msg
}
+ file delete -force c:/tcl8975@
+ set msg
} {d:/tcl8975@}
test fCmd-6.21 {CopyRenameOneFile: copy/rename: S_ISDIR(source)} \
{unixOnly notRoot} {
diff --git a/tests/fileName.test b/tests/fileName.test
index 5986136..a13b862 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.8 2000/04/10 17:18:59 ericm Exp $
+# RCS: @(#) $Id: fileName.test,v 1.9 2000/09/29 01:12:15 hobbs Exp $
if {[lsearch [namespace children] ::tcltest] == -1} {
package require tcltest
@@ -1451,14 +1451,12 @@ test filename-15.6 {unix specific globbing} {unixOnly} {
} [list 0 [list [glob ~]/globTest/odd\\\[\]*?\{\}name]]
catch {exec rm -f globTest/odd\\\[\]*?\{\}name}
-
# The following tests are only valid for Windows systems.
-set temp [pwd]
-catch {cd c:/}
-catch {
+set oldDir [pwd]
+if {$::tcltest::testConstraints(pcOnly)} {
cd c:/
- removeDirectory globTest
- makeDirectory globTest
+ file delete -force globTest
+ file mkdir globTest
close [open globTest/x1.BAT w]
close [open globTest/y1.Bat w]
close [open globTest/z1.bat w]
@@ -1508,41 +1506,19 @@ if {[catch {cd //[info hostname]/c}]} {
test filename-16.12 {windows specific globbing} {pcOnly sharedCdrive} {
cd //[info hostname]/c
- removeDirectory globTest
- makeDirectory globTest
- close [open globTest/x1.BAT w]
- close [open globTest/y1.Bat w]
- close [open globTest/z1.bat w]
glob //[info hostname]/c/*Test
} //[info hostname]/c/globTest
test filename-16.13 {windows specific globbing} {pcOnly sharedCdrive} {
cd //[info hostname]/c
- removeDirectory globTest
- makeDirectory globTest
- close [open globTest/x1.BAT w]
- close [open globTest/y1.Bat w]
- close [open globTest/z1.bat w]
glob "\\\\\\\\[info hostname]\\\\c\\\\*Test"
} //[info hostname]/c/globTest
# cleanup
-file delete -force //[info hostname]/c/globTest
-cd $temp
+file delete -force C:/globTest
+cd $oldDir
file delete -force globTest
set env(HOME) $oldhome
testsetplatform $platform
catch {unset oldhome platform temp result}
::tcltest::cleanupTests
return
-
-
-
-
-
-
-
-
-
-
-
-
--
cgit v0.12