Massive test cleanup; all tests are run, and constraints are used where necessary.

1 files changed, 11 insertions, 8 deletions

diff --git a/tests/winFCmd.test b/tests/winFCmd.test
index d118e27..5da5dd4 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.27 2004/05/04 22:30:24 hobbs Exp $
+# RCS: @(#) $Id: winFCmd.test,v 1.28 2004/05/19 20:15:32 dkf Exp $
 #
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
@@ -58,9 +58,6 @@ if {[string equal $tcl_platform(platform) "windows"]} {
     tcltest::testConstraint winOlderThan2000 0
 }
 
-set ::tcltest::testConstraints(cdrom) 0
-set ::tcltest::testConstraints(exdev) 0
-
 # find a CD-ROM so we can test read-only filesystems.
 
 set cdrom {}
@@ -99,25 +96,31 @@ proc findfile {dir} {
 }
 
 if {$cdrom != ""} {
-    set ::tcltest::testConstraints(cdrom) 1
+    testConstraint cdrom 1
     set cdfile [findfile $cdrom]
+} else {
+    testConstraint cdrom 0
 }
 
 if {[file exists c:/] && [file exists d:/]} {
     catch {file delete d:/tf1}
     if {[catch {close [open d:/tf1 w]}] == 0} {
 	file delete d:/tf1
-	set ::tcltest::testConstraints(exdev) 1
+	testConstraint exdev 1
+    } else {
+	testConstraint exdev 0
     }
+} else {
+    testConstraint exdev 0
 }
 
 file delete -force -- td1
 set foo [catch {open td1 w} testfile]
 if {$foo} {
-    set ::tcltest::testConstraints(longFileNames) 0
+    testConstraint longFileNames 0
 } else {
     close $testfile
-    set ::tcltest::testConstraints(longFileNames) 1
+    testConstraint longFileNames 1
     file delete -force -- td1
 }