Standardize some use of test constraints onto names that are documented

1 files changed, 165 insertions, 165 deletions

diff --git a/tests/winFCmd.test b/tests/winFCmd.test
index c90b120..3fd622d 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.31 2004/06/23 15:10:43 dkf Exp $
+# RCS: @(#) $Id: winFCmd.test,v 1.32 2004/06/23 15:36:59 dkf Exp $
 #
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
@@ -131,64 +131,64 @@ append longname $longname
 # it can be difficult to actually forward "insane" arguments to the
 # low-level posix emulation layer.
 
-test winFCmd-1.1 {TclpRenameFile: errno: EACCES} {pcOnly cdrom} {
+test winFCmd-1.1 {TclpRenameFile: errno: EACCES} {win cdrom} {
     list [catch {testfile mv $cdfile $cdrom/dummy~~.fil} msg] $msg
 } {1 EACCES}
-test winFCmd-1.2 {TclpRenameFile: errno: EEXIST} {pcOnly} {
+test winFCmd-1.2 {TclpRenameFile: errno: EEXIST} {win} {
     cleanup
     file mkdir td1/td2/td3
     file mkdir td2
     list [catch {testfile mv td2 td1/td2} msg] $msg
 } {1 EEXIST} 
-test winFCmd-1.3 {TclpRenameFile: errno: EINVAL} {pcOnly} {
+test winFCmd-1.3 {TclpRenameFile: errno: EINVAL} {win} {
     cleanup
     list [catch {testfile mv / td1} msg] $msg
 } {1 EINVAL}
-test winFCmd-1.4 {TclpRenameFile: errno: EINVAL} {pcOnly} {
+test winFCmd-1.4 {TclpRenameFile: errno: EINVAL} {win} {
     cleanup
     file mkdir td1
     list [catch {testfile mv td1 td1/td2} msg] $msg
 } {1 EINVAL}
-test winFCmd-1.5 {TclpRenameFile: errno: EISDIR} {pcOnly} {
+test winFCmd-1.5 {TclpRenameFile: errno: EISDIR} {win} {
     cleanup
     file mkdir td1
     createfile tf1
     list [catch {testfile mv tf1 td1} msg] $msg
 } {1 EISDIR}
-test winFCmd-1.6 {TclpRenameFile: errno: ENOENT} {pcOnly} {
+test winFCmd-1.6 {TclpRenameFile: errno: ENOENT} {win} {
     cleanup
     list [catch {testfile mv tf1 tf2} msg] $msg
 } {1 ENOENT}
-test winFCmd-1.7 {TclpRenameFile: errno: ENOENT} {pcOnly} {
+test winFCmd-1.7 {TclpRenameFile: errno: ENOENT} {win} {
     cleanup
     list [catch {testfile mv "" tf2} msg] $msg
 } {1 ENOENT}
-test winFCmd-1.8 {TclpRenameFile: errno: ENOENT} {pcOnly} {
+test winFCmd-1.8 {TclpRenameFile: errno: ENOENT} {win} {
     cleanup
     createfile tf1
     list [catch {testfile mv tf1 ""} msg] $msg
 } {1 ENOENT}
-test winFCmd-1.9 {TclpRenameFile: errno: ENOTDIR} {pcOnly} {
+test winFCmd-1.9 {TclpRenameFile: errno: ENOTDIR} {win} {
     cleanup
     file mkdir td1
     createfile tf1
     list [catch {testfile mv td1 tf1} msg] $msg
 } {1 ENOTDIR}
-test winFCmd-1.10 {TclpRenameFile: errno: EXDEV} {pcOnly exdev} {
+test winFCmd-1.10 {TclpRenameFile: errno: EXDEV} {win exdev} {
     file delete -force d:/tf1
     file mkdir c:/tf1
     set msg [list [catch {testfile mv c:/tf1 d:/tf1} msg] $msg]
     file delete -force c:/tf1
     set msg
 } {1 EXDEV}
-test winFCmd-1.11 {TclpRenameFile: errno: EACCES} {pcOnly} {
+test winFCmd-1.11 {TclpRenameFile: errno: EACCES} {win} {
     cleanup
     set fd [open tf1 w]
     set msg [list [catch {testfile mv tf1 tf2} msg] $msg]
     close $fd
     set msg
 } {1 EACCES}
-test winFCmd-1.12 {TclpRenameFile: errno: EACCES} {pcOnly} {
+test winFCmd-1.12 {TclpRenameFile: errno: EACCES} {win} {
     cleanup
     createfile tf1
     set fd [open tf2 w]
@@ -196,121 +196,121 @@ test winFCmd-1.12 {TclpRenameFile: errno: EACCES} {pcOnly} {
     close $fd
     set msg
 } {1 EACCES}
-test winFCmd-1.13 {TclpRenameFile: errno: EACCES} {pcOnly win2000orXP} {
+test winFCmd-1.13 {TclpRenameFile: errno: EACCES} {win win2000orXP} {
     cleanup
     list [catch {testfile mv nul tf1} msg] $msg
 } {1 EINVAL}
-test winFCmd-1.13.1 {TclpRenameFile: errno: EACCES} {pcOnly nt winOlderThan2000} {
+test winFCmd-1.13.1 {TclpRenameFile: errno: EACCES} {win nt winOlderThan2000} {
     cleanup
     list [catch {testfile mv nul tf1} msg] $msg
 } {1 EACCES}
-test winFCmd-1.13.2 {TclpRenameFile: errno: ENOENT} {pcOnly 95} {
+test winFCmd-1.13.2 {TclpRenameFile: errno: ENOENT} {win 95} {
     cleanup
     list [catch {testfile mv nul tf1} msg] $msg
 } {1 ENOENT}
-test winFCmd-1.14 {TclpRenameFile: errno: EACCES} {pcOnly 95} {
+test winFCmd-1.14 {TclpRenameFile: errno: EACCES} {win 95} {
     cleanup
     createfile tf1
     list [catch {testfile mv tf1 nul} msg] $msg
 } {1 EACCES}
-test winFCmd-1.15 {TclpRenameFile: errno: EEXIST} {pcOnly nt} {
+test winFCmd-1.15 {TclpRenameFile: errno: EEXIST} {win nt} {
     cleanup
     createfile tf1
     list [catch {testfile mv tf1 nul} msg] $msg
 } {1 EEXIST}
-test winFCmd-1.16 {TclpRenameFile: MoveFile() != FALSE} {pcOnly} {
+test winFCmd-1.16 {TclpRenameFile: MoveFile() != FALSE} {win} {
     cleanup
     createfile tf1 tf1
     testfile mv tf1 tf2
     list [file exists tf1] [contents tf2]
 } {0 tf1}
-test winFCmd-1.17 {TclpRenameFile: MoveFile() == FALSE} {pcOnly} {
+test winFCmd-1.17 {TclpRenameFile: MoveFile() == FALSE} {win} {
     cleanup
     list [catch {testfile mv tf1 tf2} msg] $msg
 } {1 ENOENT} 
-test winFCmd-1.18 {TclpRenameFile: srcAttr == -1} {pcOnly} {
+test winFCmd-1.18 {TclpRenameFile: srcAttr == -1} {win} {
     cleanup
     list [catch {testfile mv tf1 tf2} msg] $msg
 } {1 ENOENT} 
-test winFCmd-1.19 {TclpRenameFile: errno == EACCES} {pcOnly win2000orXP} {
+test winFCmd-1.19 {TclpRenameFile: errno == EACCES} {win win2000orXP} {
     cleanup
     list [catch {testfile mv nul tf1} msg] $msg
 } {1 EINVAL}
-test winFCmd-1.19.1 {TclpRenameFile: errno == EACCES} {pcOnly nt winOlderThan2000} {
+test winFCmd-1.19.1 {TclpRenameFile: errno == EACCES} {win nt winOlderThan2000} {
     cleanup
     list [catch {testfile mv nul tf1} msg] $msg
 } {1 EACCES}
-test winFCmd-1.19.2 {TclpRenameFile: errno == ENOENT} {pcOnly 95} {
+test winFCmd-1.19.2 {TclpRenameFile: errno == ENOENT} {win 95} {
     cleanup
     list [catch {testfile mv nul tf1} msg] $msg
 } {1 ENOENT}
-test winFCmd-1.20 {TclpRenameFile: src is dir} {pcOnly nt} {
+test winFCmd-1.20 {TclpRenameFile: src is dir} {win nt} {
     # under 95, this would actually succeed and move the current dir out from 
     # under the current process!
     cleanup
     file delete /tf1
     list [catch {testfile mv [pwd] /tf1} msg] $msg
 } {1 EACCES}
-test winFCmd-1.21 {TclpRenameFile: long src} {pcOnly} {
+test winFCmd-1.21 {TclpRenameFile: long src} {win} {
     cleanup
     list [catch {testfile mv $longname tf1} msg] $msg
 } {1 ENAMETOOLONG}
-test winFCmd-1.22 {TclpRenameFile: long dst} {pcOnly} {
+test winFCmd-1.22 {TclpRenameFile: long dst} {win} {
     cleanup
     createfile tf1
     list [catch {testfile mv tf1 $longname} msg] $msg
 } {1 ENAMETOOLONG}
-test winFCmd-1.23 {TclpRenameFile: move dir into self} {pcOnly} {
+test winFCmd-1.23 {TclpRenameFile: move dir into self} {win} {
     cleanup
     file mkdir td1
     list [catch {testfile mv [pwd]/td1 td1/td2} msg] $msg
 } {1 EINVAL}
-test winFCmd-1.24 {TclpRenameFile: move a root dir} {pcOnly} {
+test winFCmd-1.24 {TclpRenameFile: move a root dir} {win} {
     cleanup
     list [catch {testfile mv / c:/} msg] $msg
 } {1 EINVAL}
-test winFCmd-1.25 {TclpRenameFile: cross file systems} {pcOnly cdrom} {
+test winFCmd-1.25 {TclpRenameFile: cross file systems} {win cdrom} {
     cleanup
     file mkdir td1
     list [catch {testfile mv td1 $cdrom/td1} msg] $msg
 } {1 EXDEV} 
-test winFCmd-1.26 {TclpRenameFile: readonly fs} {pcOnly cdrom} {
+test winFCmd-1.26 {TclpRenameFile: readonly fs} {win cdrom} {
     cleanup
     list [catch {testfile mv $cdfile $cdrom/dummy~~.fil} msg] $msg
 } {1 EACCES}
-test winFCmd-1.27 {TclpRenameFile: open file} {pcOnly} {
+test winFCmd-1.27 {TclpRenameFile: open file} {win} {
     cleanup
     set fd [open tf1 w]
     set msg [list [catch {testfile mv tf1 tf2} msg] $msg]
     close $fd
     set msg
 } {1 EACCES}    
-test winFCmd-1.28 {TclpRenameFile: errno == EEXIST} {pcOnly} {
+test winFCmd-1.28 {TclpRenameFile: errno == EEXIST} {win} {
     cleanup
     createfile tf1
     createfile tf2
     testfile mv tf1 tf2
     list [file exists tf1] [file exists tf2]
 } {0 1}
-test winFCmd-1.29 {TclpRenameFile: src is dir} {pcOnly} {
+test winFCmd-1.29 {TclpRenameFile: src is dir} {win} {
     cleanup
     file mkdir td1
     createfile tf1
     list [catch {testfile mv td1 tf1} msg] $msg
 } {1 ENOTDIR} 
-test winFCmd-1.30 {TclpRenameFile: dst is dir} {pcOnly} {
+test winFCmd-1.30 {TclpRenameFile: dst is dir} {win} {
     cleanup
     file mkdir td1
     file mkdir td2/td2
     list [catch {testfile mv td1 td2} msg] $msg
 } {1 EEXIST}
-test winFCmd-1.31 {TclpRenameFile: TclpRemoveDirectory fails} {pcOnly} {
+test winFCmd-1.31 {TclpRenameFile: TclpRemoveDirectory fails} {win} {
     cleanup
     file mkdir td1
     file mkdir td2/td2
     list [catch {testfile mv td1 td2} msg] $msg
 } {1 EEXIST}
-test winFCmd-1.32 {TclpRenameFile: TclpRemoveDirectory succeeds} {pcOnly} {
+test winFCmd-1.32 {TclpRenameFile: TclpRemoveDirectory succeeds} {win} {
     cleanup
     file mkdir td1/td2
     file mkdir td2
@@ -318,7 +318,7 @@ test winFCmd-1.32 {TclpRenameFile: TclpRemoveDirectory succeeds} {pcOnly} {
     list [file exists td1] [file exists td2] [file exists td2/td2]
 } {0 1 1}
 test winFCmd-1.33 {TclpRenameFile: After removing dst dir, MoveFile fails} \
-	{pcOnly exdev} {
+	{win exdev} {
     file mkdir d:/td1
     testchmod 000 d:/td1
     file mkdir c:/tf1
@@ -328,56 +328,56 @@ test winFCmd-1.33 {TclpRenameFile: After removing dst dir, MoveFile fails} \
     file delete -force c:/tf1
     set msg
 } {1 EXDEV 0}
-test winFCmd-1.34 {TclpRenameFile: src is dir, dst is not} {pcOnly} {
+test winFCmd-1.34 {TclpRenameFile: src is dir, dst is not} {win} {
     file mkdir td1
     createfile tf1
     list [catch {testfile mv td1 tf1} msg] $msg
 } {1 ENOTDIR}
-test winFCmd-1.35 {TclpRenameFile: src is not dir, dst is} {pcOnly} {
+test winFCmd-1.35 {TclpRenameFile: src is not dir, dst is} {win} {
     file mkdir td1
     createfile tf1
     list [catch {testfile mv tf1 td1} msg] $msg
 } {1 EISDIR}
-test winFCmd-1.36 {TclpRenameFile: src and dst not dir} {pcOnly} {
+test winFCmd-1.36 {TclpRenameFile: src and dst not dir} {win} {
     createfile tf1 tf1
     createfile tf2 tf2
     testfile mv tf1 tf2
     contents tf2
 } {tf1}
-test winFCmd-1.37 {TclpRenameFile: need to restore temp file} {pcOnly} {
+test winFCmd-1.37 {TclpRenameFile: need to restore temp file} {win} {
     # Can't figure out how to cause this. 
     # Need a file that can't be copied.
 } {}
 
-test winFCmd-2.1 {TclpCopyFile: errno: EACCES} {pcOnly cdrom} {
+test winFCmd-2.1 {TclpCopyFile: errno: EACCES} {win cdrom} {
     cleanup
     list [catch {testfile cp $cdfile $cdrom/dummy~~.fil} msg] $msg
 } {1 EACCES}
-test winFCmd-2.2 {TclpCopyFile: errno: EISDIR} {pcOnly} {
+test winFCmd-2.2 {TclpCopyFile: errno: EISDIR} {win} {
     cleanup
     file mkdir td1
     list [catch {testfile cp td1 tf1} msg] $msg
 } {1 EISDIR}
-test winFCmd-2.3 {TclpCopyFile: errno: EISDIR} {pcOnly} {
+test winFCmd-2.3 {TclpCopyFile: errno: EISDIR} {win} {
     cleanup
     createfile tf1
     file mkdir td1
     list [catch {testfile cp tf1 td1} msg] $msg
 } {1 EISDIR}
-test winFCmd-2.4 {TclpCopyFile: errno: ENOENT} {pcOnly} {
+test winFCmd-2.4 {TclpCopyFile: errno: ENOENT} {win} {
     cleanup
     list [catch {testfile cp tf1 tf2} msg] $msg
 } {1 ENOENT}
-test winFCmd-2.5 {TclpCopyFile: errno: ENOENT} {pcOnly} {
+test winFCmd-2.5 {TclpCopyFile: errno: ENOENT} {win} {
     cleanup
     list [catch {testfile cp "" tf2} msg] $msg
 } {1 ENOENT}
-test winFCmd-2.6 {TclpCopyFile: errno: ENOENT} {pcOnly} {
+test winFCmd-2.6 {TclpCopyFile: errno: ENOENT} {win} {
     cleanup
     createfile tf1
     list [catch {testfile cp tf1 ""} msg] $msg
 } {1 ENOENT}
-test winFCmd-2.7 {TclpCopyFile: errno: EACCES} {pcOnly 95} {
+test winFCmd-2.7 {TclpCopyFile: errno: EACCES} {win 95} {
     cleanup
     createfile tf1
     set fd [open tf2 w]
@@ -385,61 +385,61 @@ test winFCmd-2.7 {TclpCopyFile: errno: EACCES} {pcOnly 95} {
     close $fd
     set msg
 } {1 EACCES}
-test winFCmd-2.8 {TclpCopyFile: errno: EACCES} {pcOnly win2000orXP} {
+test winFCmd-2.8 {TclpCopyFile: errno: EACCES} {win win2000orXP} {
     cleanup
     list [catch {testfile cp nul tf1} msg] $msg
 } {1 EINVAL}
-test winFCmd-2.8.1 {TclpCopyFile: errno: EACCES} {pcOnly nt winOlderThan2000} {
+test winFCmd-2.8.1 {TclpCopyFile: errno: EACCES} {win nt winOlderThan2000} {
     cleanup
     list [catch {testfile cp nul tf1} msg] $msg
 } {1 EACCES}
-test winFCmd-2.9 {TclpCopyFile: errno: ENOENT} {pcOnly 95} {
+test winFCmd-2.9 {TclpCopyFile: errno: ENOENT} {win 95} {
     cleanup
     list [catch {testfile cp nul tf1} msg] $msg
 } {1 ENOENT}
-test winFCmd-2.10 {TclpCopyFile: CopyFile succeeds} {pcOnly} {
+test winFCmd-2.10 {TclpCopyFile: CopyFile succeeds} {win} {
     cleanup
     createfile tf1 tf1
     testfile cp tf1 tf2
     list [contents tf1] [contents tf2]
 } {tf1 tf1}
-test winFCmd-2.11 {TclpCopyFile: CopyFile succeeds} {pcOnly} {
+test winFCmd-2.11 {TclpCopyFile: CopyFile succeeds} {win} {
     cleanup
     createfile tf1 tf1
     createfile tf2 tf2
     testfile cp tf1 tf2
     list [contents tf1] [contents tf2]
 } {tf1 tf1}
-test winFCmd-2.12 {TclpCopyFile: CopyFile succeeds} {pcOnly} {
+test winFCmd-2.12 {TclpCopyFile: CopyFile succeeds} {win} {
     cleanup
     createfile tf1 tf1
     testchmod 000 tf1
     testfile cp tf1 tf2
     list [contents tf2] [file writable tf2]
 } {tf1 0}
-test winFCmd-2.13 {TclpCopyFile: CopyFile fails} {pcOnly} {
+test winFCmd-2.13 {TclpCopyFile: CopyFile fails} {win} {
     cleanup
     createfile tf1
     file mkdir td1
     list [catch {testfile cp tf1 td1} msg] $msg
 } {1 EISDIR} 
-test winFCmd-2.14 {TclpCopyFile: errno == EACCES} {pcOnly} {
+test winFCmd-2.14 {TclpCopyFile: errno == EACCES} {win} {
     cleanup
     file mkdir td1
     list [catch {testfile cp td1 tf1} msg] $msg
 } {1 EISDIR}
-test winFCmd-2.15 {TclpCopyFile: src is directory} {pcOnly} {
+test winFCmd-2.15 {TclpCopyFile: src is directory} {win} {
     cleanup
     file mkdir td1
     list [catch {testfile cp td1 tf1} msg] $msg
 } {1 EISDIR}
-test winFCmd-2.16 {TclpCopyFile: dst is directory} {pcOnly} {
+test winFCmd-2.16 {TclpCopyFile: dst is directory} {win} {
     cleanup
     createfile tf1
     file mkdir td1
     list [catch {testfile cp tf1 td1} msg] $msg
 } {1 EISDIR}
-test winFCmd-2.17 {TclpCopyFile: dst is readonly} {pcOnly} {
+test winFCmd-2.17 {TclpCopyFile: dst is readonly} {win} {
     cleanup
     createfile tf1 tf1
     createfile tf2 tf2
@@ -447,7 +447,7 @@ test winFCmd-2.17 {TclpCopyFile: dst is readonly} {pcOnly} {
     testfile cp tf1 tf2
     list [file writable tf2] [contents tf2]
 } {1 tf1}
-test winFCmd-2.18 {TclpCopyFile: still can't copy onto dst} {pcOnly 95} {
+test winFCmd-2.18 {TclpCopyFile: still can't copy onto dst} {win 95} {
     cleanup
     createfile tf1
     createfile tf2
@@ -458,59 +458,59 @@ test winFCmd-2.18 {TclpCopyFile: still can't copy onto dst} {pcOnly 95} {
     set msg "$msg [file writable tf2]"
 } {1 EACCES 0}    
 
-test winFCmd-3.1 {TclpDeleteFile: errno: EACCES} {pcOnly cdrom} {
+test winFCmd-3.1 {TclpDeleteFile: errno: EACCES} {win cdrom} {
     list [catch {testfile rm $cdfile $cdrom/dummy~~.fil} msg] $msg
 } {1 EACCES}
-test winFCmd-3.2 {TclpDeleteFile: errno: EISDIR} {pcOnly} {
+test winFCmd-3.2 {TclpDeleteFile: errno: EISDIR} {win} {
     cleanup
     file mkdir td1
     list [catch {testfile rm td1} msg] $msg
 } {1 EISDIR} 
-test winFCmd-3.3 {TclpDeleteFile: errno: ENOENT} {pcOnly} {
+test winFCmd-3.3 {TclpDeleteFile: errno: ENOENT} {win} {
     cleanup
     list [catch {testfile rm tf1} msg] $msg
 } {1 ENOENT}
-test winFCmd-3.4 {TclpDeleteFile: errno: ENOENT} {pcOnly} {
+test winFCmd-3.4 {TclpDeleteFile: errno: ENOENT} {win} {
     cleanup
     list [catch {testfile rm ""} msg] $msg
 } {1 ENOENT}
-test winFCmd-3.5 {TclpDeleteFile: errno: EACCES} {pcOnly} {
+test winFCmd-3.5 {TclpDeleteFile: errno: EACCES} {win} {
     cleanup
     set fd [open tf1 w]
     set msg [list [catch {testfile rm tf1} msg] $msg]
     close $fd
     set msg
 } {1 EACCES}
-test winFCmd-3.6 {TclpDeleteFile: errno: EACCES} {pcOnly} {
+test winFCmd-3.6 {TclpDeleteFile: errno: EACCES} {win} {
     cleanup
     list [catch {testfile rm nul} msg] $msg
 } {1 EACCES}
-test winFCmd-3.7 {TclpDeleteFile: DeleteFile succeeds} {pcOnly} {
+test winFCmd-3.7 {TclpDeleteFile: DeleteFile succeeds} {win} {
     cleanup
     createfile tf1
     testfile rm tf1
     file exists tf1
 } {0}
-test winFCmd-3.8 {TclpDeleteFile: DeleteFile fails} {pcOnly} {
+test winFCmd-3.8 {TclpDeleteFile: DeleteFile fails} {win} {
     cleanup
     file mkdir td1
     list [catch {testfile rm td1} msg] $msg
 } {1 EISDIR}
-test winFCmd-3.9 {TclpDeleteFile: errno == EACCES} {pcOnly} {
+test winFCmd-3.9 {TclpDeleteFile: errno == EACCES} {win} {
     cleanup
     set fd [open tf1 w]
     set msg [list [catch {testfile rm tf1} msg] $msg]
     close $fd
     set msg
 } {1 EACCES}
-test winFCmd-3.10 {TclpDeleteFile: path is readonly} {pcOnly} {
+test winFCmd-3.10 {TclpDeleteFile: path is readonly} {win} {
     cleanup
     createfile tf1
     testchmod 000 tf1
     testfile rm tf1
     file exists tf1
 } {0}
-test winFCmd-3.11 {TclpDeleteFile: still can't remove path} {pcOnly} {
+test winFCmd-3.11 {TclpDeleteFile: still can't remove path} {win} {
     cleanup
     set fd [open tf1 w]
     testchmod 000 tf1
@@ -519,93 +519,93 @@ test winFCmd-3.11 {TclpDeleteFile: still can't remove path} {pcOnly} {
     set msg
 } {1 EACCES}
 
-test winFCmd-4.1 {TclpCreateDirectory: errno: EACCES} {pcOnly nt cdrom} {
+test winFCmd-4.1 {TclpCreateDirectory: errno: EACCES} {win nt cdrom} {
     list [catch {testfile mkdir $cdrom/dummy~~.dir} msg] $msg
 } {1 EACCES}
-test winFCmd-4.2 {TclpCreateDirectory: errno: EACCES} {pcOnly 95 cdrom} {
+test winFCmd-4.2 {TclpCreateDirectory: errno: EACCES} {win 95 cdrom} {
     list [catch {testfile mkdir $cdrom/dummy~~.dir} msg] $msg
 } {1 ENOSPC}
-test winFCmd-4.3 {TclpCreateDirectory: errno: EEXIST} {pcOnly} {
+test winFCmd-4.3 {TclpCreateDirectory: errno: EEXIST} {win} {
     cleanup
     file mkdir td1
     list [catch {testfile mkdir td1} msg] $msg
 } {1 EEXIST}
-test winFCmd-4.4 {TclpCreateDirectory: errno: ENOENT} {pcOnly} {
+test winFCmd-4.4 {TclpCreateDirectory: errno: ENOENT} {win} {
     cleanup
     list [catch {testfile mkdir td1/td2} msg] $msg
 } {1 ENOENT}
-test winFCmd-4.5 {TclpCreateDirectory: CreateDirectory succeeds} {pcOnly} {
+test winFCmd-4.5 {TclpCreateDirectory: CreateDirectory succeeds} {win} {
     cleanup
     testfile mkdir td1
     file type td1
 } {directory}
 
-test winFCmd-5.1 {TclpCopyDirectory: calls TraverseWinTree} {pcOnly} {
+test winFCmd-5.1 {TclpCopyDirectory: calls TraverseWinTree} {win} {
     cleanup
     file mkdir td1
     testfile cpdir td1 td2
     list [file type td1] [file type td2]
 } {directory directory}
 
-test winFCmd-6.1 {TclpRemoveDirectory: errno: EACCES} {pcOnly} {
+test winFCmd-6.1 {TclpRemoveDirectory: errno: EACCES} {win} {
     cleanup
     file mkdir td1
     testchmod 000 td1
     testfile rmdir td1
     file exists td1
 } {0}
-test winFCmd-6.2 {TclpRemoveDirectory: errno: EEXIST} {pcOnly} {
+test winFCmd-6.2 {TclpRemoveDirectory: errno: EEXIST} {win} {
     cleanup
     file mkdir td1/td2
     list [catch {testfile rmdir td1} msg] [file tail $msg]
 } {1 {td1 EEXIST}}
-test winFCmd-6.3 {TclpRemoveDirectory: errno: EACCES} {pcOnly} {
+test winFCmd-6.3 {TclpRemoveDirectory: errno: EACCES} {win} {
     # can't test this w/o removing everything on your hard disk first!
     # testfile rmdir /
 } {}
-test winFCmd-6.4 {TclpRemoveDirectory: errno: ENOENT} {pcOnly} {
+test winFCmd-6.4 {TclpRemoveDirectory: errno: ENOENT} {win} {
     cleanup
     list [catch {testfile rmdir td1} msg] [file tail $msg]
 } {1 {td1 ENOENT}}
-test winFCmd-6.5 {TclpRemoveDirectory: errno: ENOENT} {pcOnly} {
+test winFCmd-6.5 {TclpRemoveDirectory: errno: ENOENT} {win} {
     cleanup
     list [catch {testfile rmdir ""} msg] $msg
 } {1 ENOENT}
-test winFCmd-6.6 {TclpRemoveDirectory: errno: ENOTDIR} {pcOnly} {
+test winFCmd-6.6 {TclpRemoveDirectory: errno: ENOTDIR} {win} {
     cleanup
     createfile tf1
     list [catch {testfile rmdir tf1} msg] [file tail $msg]
 } {1 {tf1 ENOTDIR}}
-test winFCmd-6.7 {TclpRemoveDirectory: RemoveDirectory succeeds} {pcOnly} {
+test winFCmd-6.7 {TclpRemoveDirectory: RemoveDirectory succeeds} {win} {
     cleanup
     file mkdir td1
     testfile rmdir td1
     file exists td1
 } {0}
-test winFCmd-6.8 {TclpRemoveDirectory: RemoveDirectory fails} {pcOnly} {
+test winFCmd-6.8 {TclpRemoveDirectory: RemoveDirectory fails} {win} {
     cleanup
     createfile tf1
     list [catch {testfile rmdir tf1} msg] [file tail $msg]
 } {1 {tf1 ENOTDIR}}
-test winFCmd-6.9 {TclpRemoveDirectory: errno == EACCES} {pcOnly} {
+test winFCmd-6.9 {TclpRemoveDirectory: errno == EACCES} {win} {
     cleanup
     file mkdir td1
     testchmod 000 td1
     testfile rmdir td1
     file exists td1
 } {0}
-test winFCmd-6.10 {TclpRemoveDirectory: attr == -1} {pcOnly 95} {
+test winFCmd-6.10 {TclpRemoveDirectory: attr == -1} {win 95} {
     cleanup
     list [catch {testfile rmdir nul} msg] $msg
 } {1 {nul EACCES}}
-test winFCmd-6.11 {TclpRemoveDirectory: attr == -1} {pcOnly nt} {
+test winFCmd-6.11 {TclpRemoveDirectory: attr == -1} {win nt} {
     cleanup
     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"
 } [list 1 [list / EACCES or EEXIST]]
-test winFCmd-6.12 {TclpRemoveDirectory: errno == EACCES} {pcOnly 95} {
+test winFCmd-6.12 {TclpRemoveDirectory: errno == EACCES} {win 95} {
     cleanup
     createfile tf1
     set res [catch {testfile rmdir tf1} msg]
@@ -613,14 +613,14 @@ test winFCmd-6.12 {TclpRemoveDirectory: errno == EACCES} {pcOnly 95} {
     set msg [list [file tail [lindex $msg 0]] [lindex $msg 1]]
     list $res $msg
 } {1 {tf1 ENOTDIR}}
-test winFCmd-6.13 {TclpRemoveDirectory: write-protected} {pcOnly} {
+test winFCmd-6.13 {TclpRemoveDirectory: write-protected} {win} {
     cleanup
     file mkdir td1
     testchmod 000 td1
     testfile rmdir td1
     file exists td1
 } {0}
-test winFCmd-6.14 {TclpRemoveDirectory: check if empty dir} {pcOnly 95} {
+test winFCmd-6.14 {TclpRemoveDirectory: check if empty dir} {win 95} {
     cleanup
     file mkdir td1/td2
     set res [catch {testfile rmdir td1} msg]
@@ -628,79 +628,79 @@ test winFCmd-6.14 {TclpRemoveDirectory: check if empty dir} {pcOnly 95} {
     set msg [list [file tail [lindex $msg 0]] [lindex $msg 1]]
     list $res $msg
 } {1 {td1 EEXIST}}
-test winFCmd-6.15 {TclpRemoveDirectory: !recursive} {pcOnly} {
+test winFCmd-6.15 {TclpRemoveDirectory: !recursive} {win} {
     cleanup
     file mkdir td1/td2
     list [catch {testfile rmdir td1} msg] [file tail $msg]
 } {1 {td1 EEXIST}}
-test winFCmd-6.16 {TclpRemoveDirectory: recursive, but errno != EEXIST} {pcOnly} {
+test winFCmd-6.16 {TclpRemoveDirectory: recursive, but errno != EEXIST} {win} {
     cleanup
     createfile tf1
     list [catch {testfile rmdir -force tf1} msg] $msg
 } {1 {tf1 ENOTDIR}}
-test winFCmd-6.17 {TclpRemoveDirectory: calls TraverseWinTree} {pcOnly} {
+test winFCmd-6.17 {TclpRemoveDirectory: calls TraverseWinTree} {win} {
     cleanup
     file mkdir td1/td2
     testfile rmdir -force td1
     file exists td1
 } {0}
 
-test winFCmd-7.1 {TraverseWinTree: targetPtr == NULL} {pcOnly} {
+test winFCmd-7.1 {TraverseWinTree: targetPtr == NULL} {win} {
     cleanup
     file mkdir td1/td2/td3
     testfile rmdir -force td1
     file exists td1
 } {0}
-test winFCmd-7.2 {TraverseWinTree: targetPtr != NULL} {pcOnly} {
+test winFCmd-7.2 {TraverseWinTree: targetPtr != NULL} {win} {
     cleanup
     file mkdir td1/td2/td3
     testfile cpdir td1 td2
     list [file exists td1] [file exists td2]
 } {1 1}
-test winFCmd-7.3 {TraverseWinTree: sourceAttr == -1} {pcOnly} {
+test winFCmd-7.3 {TraverseWinTree: sourceAttr == -1} {win} {
     cleanup
     list [catch {testfile cpdir td1 td2} msg] $msg
 } {1 {td1 ENOENT}}
-test winFCmd-7.4 {TraverseWinTree: source isn't directory} {pcOnly} {
+test winFCmd-7.4 {TraverseWinTree: source isn't directory} {win} {
     cleanup
     file mkdir td1
     createfile td1/tf1 tf1
     testfile cpdir td1 td2
     contents td2/tf1
 } {tf1}
-test winFCmd-7.5 {TraverseWinTree: call TraversalCopy: DOTREE_F} {pcOnly} {
+test winFCmd-7.5 {TraverseWinTree: call TraversalCopy: DOTREE_F} {win} {
     cleanup
     file mkdir td1
     createfile td1/tf1 tf1
     testfile cpdir td1 td2
     contents td2/tf1
 } {tf1}
-test winFCmd-7.6 {TraverseWinTree: call TraversalDelete: DOTREE_F} {pcOnly} {
+test winFCmd-7.6 {TraverseWinTree: call TraversalDelete: DOTREE_F} {win} {
     cleanup
     file mkdir td1
     createfile td1/tf1 tf1
     testfile rmdir -force td1
     file exists td1
 } {0}
-test winFCmd-7.7 {TraverseWinTree: append \ to source if necessary} {pcOnly} {
+test winFCmd-7.7 {TraverseWinTree: append \ to source if necessary} {win} {
     cleanup
     file mkdir td1
     createfile td1/tf1 tf1
     testfile cpdir td1 td2
     contents td2/tf1
 } {tf1}    
-test winFCmd-7.8 {TraverseWinTree: append \ to source if necessary} {pcOnly 95 cdrom} {
+test winFCmd-7.8 {TraverseWinTree: append \ to source if necessary} {win 95 cdrom} {
     # cdrom can return either d:\ or D:/, but we only care about the errcode
     list [catch {testfile rmdir $cdrom/} msg] [lindex $msg 1]
 } {1 EACCES} ; # was EEXIST, but changed for win98.
-test winFCmd-7.9 {TraverseWinTree: append \ to source if necessary} {pcOnly nt cdrom} {
+test winFCmd-7.9 {TraverseWinTree: append \ to source if necessary} {win nt cdrom} {
     list [catch {testfile rmdir $cdrom/} msg]  [lindex $msg 1]
 } {1 EACCES}
 test winFCmd-7.10 {TraverseWinTree: can't read directory: handle == INVALID} \
-	{pcOnly} {
+	{win} {
     # can't make it happen
 } {}
-test winFCmd-7.11 {TraverseWinTree: call TraversalCopy: DOTREE_PRED} {pcOnly} {
+test winFCmd-7.11 {TraverseWinTree: call TraversalCopy: DOTREE_PRED} {win} {
     cleanup
     file mkdir td1
     testchmod 000 td1
@@ -708,36 +708,36 @@ test winFCmd-7.11 {TraverseWinTree: call TraversalCopy: DOTREE_PRED} {pcOnly} {
     testfile cpdir td1 td2
     list [file exists td2] [file writable td2]
 } {1 0}
-test winFCmd-7.12 {TraverseWinTree: call TraversalDelete: DOTREE_PRED} {pcOnly} {
+test winFCmd-7.12 {TraverseWinTree: call TraversalDelete: DOTREE_PRED} {win} {
     cleanup
     file mkdir td1
     createfile td1/tf1 tf1
     testfile rmdir -force td1
     file exists td1
 } {0}
-test winFCmd-7.13 {TraverseWinTree: append \ to target if necessary} {pcOnly} {
+test winFCmd-7.13 {TraverseWinTree: append \ to target if necessary} {win} {
     cleanup
     file mkdir td1
     createfile td1/tf1 tf1
     testfile cpdir td1 td2
     contents td2/tf1
 } {tf1}    
-test winFCmd-7.14 {TraverseWinTree: append \ to target if necessary} {pcOnly 95} {
+test winFCmd-7.14 {TraverseWinTree: append \ to target if necessary} {win 95} {
     cleanup
     file mkdir td1
     list [catch {testfile cpdir td1 /} msg] $msg
 } {1 {/ EEXIST}}
-test winFCmd-7.15 {TraverseWinTree: append \ to target if necessary} {pcOnly nt} {
+test winFCmd-7.15 {TraverseWinTree: append \ to target if necessary} {win nt} {
     cleanup
     file mkdir td1
     list [catch {testfile cpdir td1 /} msg] $msg
 } {1 {/ EACCES}}
-test winFCmd-7.16 {TraverseWinTree: recurse on files: no files} {pcOnly} {
+test winFCmd-7.16 {TraverseWinTree: recurse on files: no files} {win} {
     cleanup
     file mkdir td1
     testfile cpdir td1 td2
 } {}
-test winFCmd-7.17 {TraverseWinTree: recurse on files: one file} {pcOnly} {
+test winFCmd-7.17 {TraverseWinTree: recurse on files: one file} {win} {
     cleanup
     file mkdir td1
     createfile td1/td2
@@ -745,7 +745,7 @@ test winFCmd-7.17 {TraverseWinTree: recurse on files: one file} {pcOnly} {
     glob td2/*
 } {td2/td2}
 test winFCmd-7.18 {TraverseWinTree: recurse on files: several files and dir} \
-	{pcOnly} {
+	{win} {
     cleanup
     file mkdir td1
     createfile td1/tf1
@@ -756,7 +756,7 @@ test winFCmd-7.18 {TraverseWinTree: recurse on files: several files and dir} \
     testfile cpdir td1 td2
     lsort [glob td2/*]
 } {td2/td2 td2/tf1 td2/tf2 td2/tf3 td2/tf4}
-test winFCmd-7.19 {TraverseWinTree: call TraversalCopy: DOTREE_POSTD} {pcOnly} {
+test winFCmd-7.19 {TraverseWinTree: call TraversalCopy: DOTREE_POSTD} {win} {
     cleanup
     file mkdir td1
     testchmod 000 td1
@@ -765,43 +765,43 @@ test winFCmd-7.19 {TraverseWinTree: call TraversalCopy: DOTREE_POSTD} {pcOnly} {
     list [file exists td2] [file writable td2]
 } {1 0}
 test winFCmd-7.20 {TraverseWinTree: call TraversalDelete: DOTREE_POSTD} \
-	{pcOnly} {
+	{win} {
     cleanup
     file mkdir td1
     createfile td1/tf1 tf1
     testfile rmdir -force td1
     file exists td1
 } {0}
-test winFCmd-7.21 {TraverseWinTree: fill errorPtr} {pcOnly} {
+test winFCmd-7.21 {TraverseWinTree: fill errorPtr} {win} {
     cleanup
     list [catch {testfile cpdir td1 td2} msg] $msg
 } {1 {td1 ENOENT}}
 
-test winFCmd-8.1 {TraversalCopy: DOTREE_F} {pcOnly} {
+test winFCmd-8.1 {TraversalCopy: DOTREE_F} {win} {
     cleanup
     file mkdir td1
     list [catch {testfile cpdir td1 td1} msg] $msg
 } {1 {td1 EEXIST}}
-test winFCmd-8.2 {TraversalCopy: DOTREE_PRED} {pcOnly} {
+test winFCmd-8.2 {TraversalCopy: DOTREE_PRED} {win} {
     cleanup
     file mkdir td1/td2
     testchmod 000 td1
     testfile cpdir td1 td2
     list [file writable td1] [file writable td1/td2]
 } {0 1}
-test winFCmd-8.3 {TraversalCopy: DOTREE_POSTD} {pcOnly} {
+test winFCmd-8.3 {TraversalCopy: DOTREE_POSTD} {win} {
     cleanup
     file mkdir td1
     testfile cpdir td1 td2
 } {}
 
-test winFCmd-9.1 {TraversalDelete: DOTREE_F} {pcOnly} {
+test winFCmd-9.1 {TraversalDelete: DOTREE_F} {win} {
     cleanup
     file mkdir td1
     createfile td1/tf1
     testfile rmdir -force td1
 } {}
-test winFCmd-9.2 {TraversalDelete: DOTREE_F} {pcOnly 95} {
+test winFCmd-9.2 {TraversalDelete: DOTREE_F} {win 95} {
     cleanup
     file mkdir td1
     set fd [open td1/tf1 w]
@@ -809,49 +809,49 @@ test winFCmd-9.2 {TraversalDelete: DOTREE_F} {pcOnly 95} {
     close $fd
     set msg
 } {1 {td1\tf1 EACCES}}
-test winFCmd-9.3 {TraversalDelete: DOTREE_PRED} {pcOnly} {
+test winFCmd-9.3 {TraversalDelete: DOTREE_PRED} {win} {
     cleanup
     file mkdir td1/td2
     testchmod 000 td1
     testfile rmdir -force td1
     file exists td1
 } {0}
-test winFCmd-9.4 {TraversalDelete: DOTREE_POSTD} {pcOnly} {
+test winFCmd-9.4 {TraversalDelete: DOTREE_POSTD} {win} {
     cleanup
     file mkdir td1/td1/td3/td4/td5
     testfile rmdir -force td1
 } {}
 
-test winFCmd-10.1 {AttributesPosixError - get} {pcOnly} {
+test winFCmd-10.1 {AttributesPosixError - get} {win} {
     cleanup
     list [catch {file attributes td1 -archive} msg] $msg
 } {1 {could not read "td1": no such file or directory}}
-test winFCmd-10.2 {AttributesPosixError - set} {pcOnly} {
+test winFCmd-10.2 {AttributesPosixError - set} {win} {
     cleanup
     list [catch {file attributes td1 -archive 0} msg] $msg
 } {1 {could not read "td1": no such file or directory}}
 
-test winFCmd-11.1 {GetWinFileAttributes} {pcOnly} {
+test winFCmd-11.1 {GetWinFileAttributes} {win} {
     cleanup
     close [open td1 w]
     list [catch {file attributes td1 -archive} msg] $msg [cleanup]
 } {0 1 {}}
-test winFCmd-11.2 {GetWinFileAttributes} {pcOnly} {
+test winFCmd-11.2 {GetWinFileAttributes} {win} {
     cleanup
     close [open td1 w]
     list [catch {file attributes td1 -readonly} msg] $msg [cleanup]
 } {0 0 {}}
-test winFCmd-11.3 {GetWinFileAttributes} {pcOnly} {
+test winFCmd-11.3 {GetWinFileAttributes} {win} {
     cleanup
     close [open td1 w]
     list [catch {file attributes td1 -hidden} msg] $msg [cleanup]
 } {0 0 {}}
-test winFCmd-11.4 {GetWinFileAttributes} {pcOnly} {
+test winFCmd-11.4 {GetWinFileAttributes} {win} {
     cleanup
     close [open td1 w]
     list [catch {file attributes td1 -system} msg] $msg [cleanup]
 } {0 0 {}}
-test winFCmd-11.5 {GetWinFileAttributes} {pcOnly} {
+test winFCmd-11.5 {GetWinFileAttributes} {win} {
     # attr of relative paths that resolve to root was failing
     # don't care about answer, just that test runs.
 
@@ -862,124 +862,124 @@ test winFCmd-11.5 {GetWinFileAttributes} {pcOnly} {
     file attr . 
     cd $old
 } {}
-test winFCmd-11.6 {GetWinFileAttributes} {pcOnly} {
+test winFCmd-11.6 {GetWinFileAttributes} {win} {
     file attr c:/ -hidden
 } {0}
 
-test winFCmd-12.1 {ConvertFileNameFormat} {pcOnly} {
+test winFCmd-12.1 {ConvertFileNameFormat} {win} {
     cleanup
     close [open td1 w]
     list [catch {string tolower [file attributes td1 -longname]} msg] $msg [cleanup]
 } {0 td1 {}}
-test winFCmd-12.2 {ConvertFileNameFormat} {pcOnly} {
+test winFCmd-12.2 {ConvertFileNameFormat} {win} {
     cleanup
     file mkdir td1
     close [open td1/td1 w]
     list [catch {string tolower [file attributes td1/td1 -longname]} msg] $msg [cleanup]
 } {0 td1/td1 {}}
-test winFCmd-12.3 {ConvertFileNameFormat} {pcOnly} {
+test winFCmd-12.3 {ConvertFileNameFormat} {win} {
     cleanup
     file mkdir td1
     file mkdir td1/td2
     close [open td1/td3 w]
     list [catch {string tolower [file attributes td1/td2/../td3 -longname]} msg] $msg [cleanup]
 } {0 td1/td2/../td3 {}}
-test winFCmd-12.4 {ConvertFileNameFormat} {pcOnly} {
+test winFCmd-12.4 {ConvertFileNameFormat} {win} {
     cleanup
     close [open td1 w]
     list [catch {string tolower [file attributes ./td1 -longname]} msg] $msg [cleanup]
 } {0 ./td1 {}}
-test winFCmd-12.5 {ConvertFileNameFormat: absolute path} {pcOnly} {
+test winFCmd-12.5 {ConvertFileNameFormat: absolute path} {win} {
     list [file attributes / -longname] [file attributes \\ -longname]
 } {/ /}
-test winFCmd-12.6 {ConvertFileNameFormat: absolute path with drive} {pcOnly} {
+test winFCmd-12.6 {ConvertFileNameFormat: absolute path with drive} {win} {
     catch {file delete -force -- c:/td1}
     close [open c:/td1 w]
     list [catch {string tolower [file attributes c:/td1 -longname]} msg] $msg [file delete -force -- c:/td1]
 } {0 c:/td1 {}}
-test winFCmd-12.7 {ConvertFileNameFormat} {nonPortable pcOnly} {
+test winFCmd-12.7 {ConvertFileNameFormat} {nonPortable win} {
     string tolower [file attributes //bisque/tcl/ws -longname]
 } {//bisque/tcl/ws}
-test winFCmd-12.8 {ConvertFileNameFormat} {pcOnly longFileNames} {
+test winFCmd-12.8 {ConvertFileNameFormat} {win longFileNames} {
     cleanup
     close [open td1 w]
     list [catch {string tolower [file attributes td1 -longname]} msg] $msg [cleanup]
 } {0 td1 {}}
-test winFCmd-12.10 {ConvertFileNameFormat} {longFileNames pcOnly} {
+test winFCmd-12.10 {ConvertFileNameFormat} {longFileNames win} {
     cleanup
     close [open td1td1td1 w]
     list [catch {file attributes td1td1td1 -shortname}] [cleanup]
 } {0 {}}
-test winFCmd-12.11 {ConvertFileNameFormat} {longFileNames pcOnly} {
+test winFCmd-12.11 {ConvertFileNameFormat} {longFileNames win} {
     cleanup
     close [open td1 w]
     list [catch {string tolower [file attributes td1 -shortname]} msg] $msg [cleanup]
 } {0 td1 {}}
 
-test winFCmd-13.1 {GetWinFileLongName} {pcOnly} {
+test winFCmd-13.1 {GetWinFileLongName} {win} {
     cleanup
     close [open td1 w]
     list [catch {string tolower [file attributes td1 -longname]} msg] $msg [cleanup]
 } {0 td1 {}}
 
-test winFCmd-14.1 {GetWinFileShortName} {pcOnly} {
+test winFCmd-14.1 {GetWinFileShortName} {win} {
     cleanup
     close [open td1 w]
     list [catch {string tolower [file attributes td1 -shortname]} msg] $msg [cleanup]
 } {0 td1 {}}
 
-test winFCmd-15.1 {SetWinFileAttributes} {pcOnly} {
+test winFCmd-15.1 {SetWinFileAttributes} {win} {
     cleanup
     list [catch {file attributes td1 -archive 0} msg] $msg
 } {1 {could not read "td1": no such file or directory}}
-test winFCmd-15.2 {SetWinFileAttributes - archive} {pcOnly} {
+test winFCmd-15.2 {SetWinFileAttributes - archive} {win} {
     cleanup
     close [open td1 w]
     list [catch {file attributes td1 -archive 1} msg] $msg [file attributes td1 -archive] [cleanup]
 } {0 {} 1 {}}
-test winFCmd-15.3 {SetWinFileAttributes - archive} {pcOnly} {
+test winFCmd-15.3 {SetWinFileAttributes - archive} {win} {
     cleanup
     close [open td1 w]
     list [catch {file attributes td1 -archive 0} msg] $msg [file attributes td1 -archive] [cleanup]
 } {0 {} 0 {}}
-test winFCmd-15.4 {SetWinFileAttributes - hidden} {pcOnly} {
+test winFCmd-15.4 {SetWinFileAttributes - hidden} {win} {
     cleanup
     close [open td1 w]
     list [catch {file attributes td1 -hidden 1} msg] $msg [file attributes td1 -hidden] [file attributes td1 -hidden 0] [cleanup]
 } {0 {} 1 {} {}}
-test winFCmd-15.5 {SetWinFileAttributes - hidden} {pcOnly} {
+test winFCmd-15.5 {SetWinFileAttributes - hidden} {win} {
     cleanup
     close [open td1 w]
     list [catch {file attributes td1 -hidden 0} msg] $msg [file attributes td1 -hidden] [cleanup]
 } {0 {} 0 {}}
-test winFCmd-15.6 {SetWinFileAttributes - readonly} {pcOnly} {
+test winFCmd-15.6 {SetWinFileAttributes - readonly} {win} {
     cleanup
     close [open td1 w]
     list [catch {file attributes td1 -readonly 1} msg] $msg [file attributes td1 -readonly] [cleanup]
 } {0 {} 1 {}}
-test winFCmd-15.7 {SetWinFileAttributes - readonly} {pcOnly} {
+test winFCmd-15.7 {SetWinFileAttributes - readonly} {win} {
     cleanup
     close [open td1 w]
     list [catch {file attributes td1 -readonly 0} msg] $msg [file attributes td1 -readonly] [cleanup]
 } {0 {} 0 {}}
-test winFCmd-15.8 {SetWinFileAttributes - system} {pcOnly} {
+test winFCmd-15.8 {SetWinFileAttributes - system} {win} {
     cleanup
     close [open td1 w]
     list [catch {file attributes td1 -system 1} msg] $msg [file attributes td1 -system] [cleanup]
 } {0 {} 1 {}}
-test winFCmd-15.9 {SetWinFileAttributes - system} {pcOnly} {
+test winFCmd-15.9 {SetWinFileAttributes - system} {win} {
     cleanup
     close [open td1 w]
     list [catch {file attributes td1 -system 0} msg] $msg [file attributes td1 -system] [cleanup]
 } {0 {} 0 {}}
-test winFCmd-15.10 {SetWinFileAttributes - failing} {pcOnly cdrom} {
+test winFCmd-15.10 {SetWinFileAttributes - failing} {win cdrom} {
     cleanup
     catch {file attributes $cdfile -archive 1}
 } {1}
-test winFCmd-16.1 {Windows file normalization} {pcOnly} {
+test winFCmd-16.1 {Windows file normalization} {win} {
     list [file normalize c:/] [file normalize C:/]
 } {C:/ C:/}
-test winFCmd-16.2 {Windows file normalization} {pcOnly} {
+test winFCmd-16.2 {Windows file normalization} {win} {
     close [open td1... w]
     set res [file tail [file normalize td1]]
     file delete td1...
@@ -989,32 +989,32 @@ test winFCmd-16.2 {Windows file normalization} {pcOnly} {
 set pwd [pwd]
 set d [string index $pwd 0]
 
-test winFCmd-16.3 {Windows file normalization} {pcOnly} {
+test winFCmd-16.3 {Windows file normalization} {win} {
     file norm ${d}:foo
 } [file join $pwd foo]
-test winFCmd-16.4 {Windows file normalization} {pcOnly} {
+test winFCmd-16.4 {Windows file normalization} {win} {
     file norm [string tolower ${d}]:foo
 } [file join $pwd foo]
-test winFCmd-16.5 {Windows file normalization} {pcOnly} {
+test winFCmd-16.5 {Windows file normalization} {win} {
     file norm ${d}:foo/bar
 } [file join $pwd foo/bar]
-test winFCmd-16.6 {Windows file normalization} {pcOnly} {
+test winFCmd-16.6 {Windows file normalization} {win} {
     file norm ${d}:foo\\bar
 } [file join $pwd foo/bar]
-test winFCmd-16.7 {Windows file normalization} {pcOnly} {
+test winFCmd-16.7 {Windows file normalization} {win} {
     file norm /bar
 } "${d}:/bar"
-test winFCmd-16.8 {Windows file normalization} {pcOnly} {
+test winFCmd-16.8 {Windows file normalization} {win} {
     file norm ///bar
 } "${d}:/bar"
-test winFCmd-16.9 {Windows file normalization} {pcOnly} {
+test winFCmd-16.9 {Windows file normalization} {win} {
     file norm /bar/foo
 } "${d}:/bar/foo"
 if {$d eq "C"} { set dd "D" } else { set dd "C" }
-test winFCmd-16.10 {Windows file normalization} {pcOnly} {
+test winFCmd-16.10 {Windows file normalization} {win} {
     file norm ${dd}:foo
 } "${dd}:/foo"
-test winFCmd-16.11 {Windows file normalization} {pcOnly cdrom} {
+test winFCmd-16.11 {Windows file normalization} {win cdrom} {
     cd ${d}:
     cd $cdrom
     cd ${d}:
@@ -1022,7 +1022,7 @@ test winFCmd-16.11 {Windows file normalization} {pcOnly cdrom} {
     # Must not crash
     set result "no crash"
 } {no crash}
-test winFCmd-16.12 {Windows file normalization} -constraints pcOnly -setup {
+test winFCmd-16.12 {Windows file normalization} -constraints win -setup {
     set oldwd [pwd]
     set oldhome ""
     catch {set oldhome $::env(HOME)}