diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2004-06-23 15:36:52 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2004-06-23 15:36:52 (GMT) |
| commit | 917f6e364bb4aaeed6b6e109ce16525d58091193 (patch) | |
| tree | 62ce3a9ba3ee31456f0967b7e5e3c7b35c33dd5e | |
| parent | 5ce4f325726f9d4a32b7499cc8a0ff0d81a2dc48 (diff) | |
| download | tcl-917f6e364bb4aaeed6b6e109ce16525d58091193.zip tcl-917f6e364bb4aaeed6b6e109ce16525d58091193.tar.gz tcl-917f6e364bb4aaeed6b6e109ce16525d58091193.tar.bz2 | |
Standardize some use of test constraints onto names that are documented
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | tests/binary.test | 8 | ||||
| -rw-r--r-- | tests/clock.test | 4 | ||||
| -rw-r--r-- | tests/cmdAH.test | 54 | ||||
| -rw-r--r-- | tests/cmdMZ.test | 4 | ||||
| -rw-r--r-- | tests/env.test | 4 | ||||
| -rw-r--r-- | tests/exec.test | 8 | ||||
| -rw-r--r-- | tests/expr-old.test | 6 | ||||
| -rw-r--r-- | tests/expr.test | 6 | ||||
| -rw-r--r-- | tests/fCmd.test | 106 | ||||
| -rw-r--r-- | tests/fileName.test | 116 | ||||
| -rw-r--r-- | tests/fileSystem.test | 52 | ||||
| -rw-r--r-- | tests/io.test | 26 | ||||
| -rw-r--r-- | tests/ioCmd.test | 8 | ||||
| -rw-r--r-- | tests/iogt.test | 8 | ||||
| -rw-r--r-- | tests/parseExpr.test | 6 | ||||
| -rw-r--r-- | tests/pkgMkIndex.test | 14 | ||||
| -rw-r--r-- | tests/registry.test | 216 | ||||
| -rw-r--r-- | tests/socket.test | 6 | ||||
| -rwxr-xr-x | tests/tcltest.test | 6 | ||||
| -rw-r--r-- | tests/unixFCmd.test | 92 | ||||
| -rw-r--r-- | tests/unixFile.test | 16 | ||||
| -rw-r--r-- | tests/unixInit.test | 36 | ||||
| -rw-r--r-- | tests/unixNotfy.test | 10 | ||||
| -rw-r--r-- | tests/winConsole.test | 6 | ||||
| -rw-r--r-- | tests/winDde.test | 88 | ||||
| -rw-r--r-- | tests/winFCmd.test | 330 | ||||
| -rw-r--r-- | tests/winFile.test | 26 | ||||
| -rw-r--r-- | tests/winNotify.test | 30 | ||||
| -rw-r--r-- | tests/winPipe.test | 143 | ||||
| -rw-r--r-- | tests/winTime.test | 6 |
31 files changed, 721 insertions, 722 deletions
@@ -1,5 +1,7 @@ 2004-06-23 Donal K. Fellows <donal.k.fellows@man.ac.uk> + * tests/*.test: Standardize use of platform constraints. + * unix/tclUnixInit.c (GetStackSize, TclpCheckStackSpace): * unix/tclUnixThrd.c (TclpThreadGetStackSize): Added code to check whether the C stack is about to be exceeded, from [Patch 746378] diff --git a/tests/binary.test b/tests/binary.test index 433219d..a611eb2 100644 --- a/tests/binary.test +++ b/tests/binary.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: binary.test,v 1.17 2004/05/20 21:04:04 dkf Exp $ +# RCS: @(#) $Id: binary.test,v 1.18 2004/06/23 15:36:55 dkf Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest @@ -1388,7 +1388,7 @@ test binary-40.1 {ScanNumber: floating point overflow} {nonPortable bigEndian} { catch {unset arg1} list [binary scan \xff\xff\xff\xff f1 arg1] $arg1 } {1 -NaN} -test binary-40.3 {ScanNumber: floating point overflow} {littleEndian pcOnly} { +test binary-40.3 {ScanNumber: floating point overflow} {littleEndian win} { catch {unset arg1} set result [binary scan \xff\xff\xff\xff f1 arg1] if {[string equal $arg1 -1.\#QNAN] || [string equal $arg1 -NAN]} { @@ -1401,7 +1401,7 @@ test binary-40.4 {ScanNumber: floating point overflow} {nonPortable bigEndian} { catch {unset arg1} list [binary scan \xff\xff\xff\xff\xff\xff\xff\xff d1 arg1] $arg1 } {1 -NaN} -test binary-40.6 {ScanNumber: floating point overflow} {littleEndian pcOnly} { +test binary-40.6 {ScanNumber: floating point overflow} {littleEndian win} { catch {unset arg1} set result [binary scan \xff\xff\xff\xff\xff\xff\xff\xff d1 arg1] if {[string equal $arg1 -1.\#QNAN] || [string equal $arg1 -NAN]} { @@ -1695,7 +1695,7 @@ test binary-51.11 {Tcl_BinaryObjCmd: format} {} { test binary-51.12 {Tcl_BinaryObjCmd: float overflow} {nonPortable bigEndian} { binary format Q NaN } \x7f\xff\xff\xff\xff\xff\xff\xff -test binary-51.13 {Tcl_BinaryObjCmd: float overflow} {nonPortable macOnly} { +test binary-51.13 {Tcl_BinaryObjCmd: float overflow} {nonPortable mac} { binary format Q NaN } \x7f\xf8\x02\xa0\x00\x00\x00\x00 test binary-51.14 {Tcl_BinaryObjCmd: format} { diff --git a/tests/clock.test b/tests/clock.test index 1c79c5a..56861ce 100644 --- a/tests/clock.test +++ b/tests/clock.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: clock.test,v 1.30 2004/05/27 18:45:35 kennykb Exp $ +# RCS: @(#) $Id: clock.test,v 1.31 2004/06/23 15:36:55 dkf Exp $ set env(LC_TIME) POSIX @@ -103,7 +103,7 @@ test clock-2.12 {clock clicks test, wrong num args} { } {1 {wrong # args: should be "clock clicks ?option?"}} # clock format -test clock-3.1 {clock format tests} {unixOnly} { +test clock-3.1 {clock format tests} {unix} { set clockval 657687766 clock format $clockval -format {%a %b %d %I:%M:%S %p %Y} -gmt true } {Sun Nov 04 03:02:46 AM 1990} diff --git a/tests/cmdAH.test b/tests/cmdAH.test index 41fef8d..f15669b 100644 --- a/tests/cmdAH.test +++ b/tests/cmdAH.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: cmdAH.test,v 1.41 2004/05/19 16:56:40 vincentdarley Exp $ +# RCS: @(#) $Id: cmdAH.test,v 1.42 2004/06/23 15:36:55 dkf Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest 2.1 @@ -205,16 +205,16 @@ test cmdAH-6.2 {Tcl_FileObjCmd: volumes} { set result 1 } } {1} -test cmdAH-6.3 {Tcl_FileObjCmd: volumes} {unixOnly} { +test cmdAH-6.3 {Tcl_FileObjCmd: volumes} {unix} { set volumeList [file volumes] catch [list glob -nocomplain [lindex $volumeList 0]*] } {0} -test cmdAH-6.4 {Tcl_FileObjCmd: volumes} winOnly { +test cmdAH-6.4 {Tcl_FileObjCmd: volumes} win { set volumeList [string tolower [file volumes]] list [catch {lsearch $volumeList "c:/"} element] [expr $element != -1] [catch {list glob -nocomplain [lindex $volumeList $element]*}] } {0 1 0} -test cmdAH-6.5 {cd} {unixOnly nonPortable} { +test cmdAH-6.5 {cd} {unix nonPortable} { set dir [pwd] cd / set res [pwd] @@ -807,7 +807,7 @@ test cmdAH-16.2 {Tcl_FileObjCmd: readable} { -result 1 } test cmdAH-16.3 {Tcl_FileObjCmd: readable} { - -constraints {unixOnly notRoot testchmod} + -constraints {unix notRoot testchmod} -setup {testchmod 0333 $gorpfile} -body {file reada $gorpfile} -result 0 @@ -846,7 +846,7 @@ test cmdAH-18.1 {Tcl_FileObjCmd: executable} {testchmod} { test cmdAH-18.2 {Tcl_FileObjCmd: executable} {testchmod notRoot} { file executable $gorpfile } 0 -test cmdAH-18.3 {Tcl_FileObjCmd: executable} {unixOnly testchmod} { +test cmdAH-18.3 {Tcl_FileObjCmd: executable} {unix testchmod} { # Only on unix will setting the execute bit on a regular file # cause that file to be executable. @@ -854,7 +854,7 @@ test cmdAH-18.3 {Tcl_FileObjCmd: executable} {unixOnly testchmod} { file exe $gorpfile } 1 -test cmdAH-18.5 {Tcl_FileObjCmd: executable} {winOnly testchmod} { +test cmdAH-18.5 {Tcl_FileObjCmd: executable} {win testchmod} { # On pc, must be a .exe, .com, etc. set x [file exe $gorpfile] @@ -863,7 +863,7 @@ test cmdAH-18.5 {Tcl_FileObjCmd: executable} {winOnly testchmod} { removeFile $gorpexe set x } {0 1} -test cmdAH-18.5.1 {Tcl_FileObjCmd: executable} {winOnly testchmod} { +test cmdAH-18.5.1 {Tcl_FileObjCmd: executable} {win testchmod} { # On pc, must be a .exe, .com, etc. set x [file exe $gorpfile] @@ -926,7 +926,7 @@ test cmdAH-19.10 {Tcl_FileObjCmd: ~ : nativename} { # directory in order to guarantee (?) a local file system: some # NFS file systems won't do the stuff below correctly. -test cmdAH-19.11 {Tcl_FileObjCmd: exists} {unixOnly notRoot} { +test cmdAH-19.11 {Tcl_FileObjCmd: exists} {unix notRoot} { file delete -force /tmp/tcl.foo.dir/file file delete -force /tmp/tcl.foo.dir makeDirectory /tmp/tcl.foo.dir @@ -973,14 +973,14 @@ test cmdAH-20.3 {Tcl_FileObjCmd: atime} { test cmdAH-20.4 {Tcl_FileObjCmd: atime} { list [catch {file atime $file notint} msg] $msg } {1 {expected integer but got "notint"}} -test cmdAH-20.5 {Tcl_FileObjCmd: atime touch} {unixOnly} { +test cmdAH-20.5 {Tcl_FileObjCmd: atime touch} {unix} { set atime [file atime $file] after 1100; # pause a sec to notice change in atime set newatime [clock seconds] set modatime [file atime $file $newatime] expr {$newatime == $modatime ? 1 : "$newatime != $modatime"} } 1 -test cmdAH-20.6 {Tcl_FileObjCmd: atime touch} {winOnly testvolumetype} { +test cmdAH-20.6 {Tcl_FileObjCmd: atime touch} {win testvolumetype} { set old [pwd] cd $::tcltest::temporaryDirectory if {![string equal "NTFS" [testvolumetype]]} { @@ -1033,12 +1033,12 @@ test cmdAH-23.1 {Tcl_FileObjCmd: lstat} { test cmdAH-23.2 {Tcl_FileObjCmd: lstat} { list [catch {file lstat a b c} msg] $msg } {1 {wrong # args: should be "file lstat name varName"}} -test cmdAH-23.3 {Tcl_FileObjCmd: lstat} {unixOnly nonPortable} { +test cmdAH-23.3 {Tcl_FileObjCmd: lstat} {unix nonPortable} { catch {unset stat} file lstat $linkfile stat lsort [array names stat] } {atime ctime dev gid ino mode mtime nlink size type uid} -test cmdAH-23.4 {Tcl_FileObjCmd: lstat} {unixOnly nonPortable} { +test cmdAH-23.4 {Tcl_FileObjCmd: lstat} {unix nonPortable} { catch {unset stat} file lstat $linkfile stat list $stat(nlink) [expr $stat(mode)&0777] $stat(type) @@ -1173,14 +1173,14 @@ test cmdAH-24.5 {Tcl_FileObjCmd: mtime} { test cmdAH-24.7 {Tcl_FileObjCmd: mtime} { list [catch {file mtime $file notint} msg] $msg } {1 {expected integer but got "notint"}} -test cmdAH-24.8 {Tcl_FileObjCmd: mtime touch} unixOnly { +test cmdAH-24.8 {Tcl_FileObjCmd: mtime touch} unix { set mtime [file mtime $file] after 1100; # pause a sec to notice change in mtime set newmtime [clock seconds] set modmtime [file mtime $file $newmtime] expr {$newmtime == $modmtime ? 1 : "$newmtime != $modmtime"} } 1 -test cmdAH-24.9 {Tcl_FileObjCmd: mtime touch with non-ascii chars} unixOnly { +test cmdAH-24.9 {Tcl_FileObjCmd: mtime touch with non-ascii chars} unix { set oldfile $file # introduce some non-ascii characters. append file \u2022 @@ -1196,7 +1196,7 @@ test cmdAH-24.9 {Tcl_FileObjCmd: mtime touch with non-ascii chars} unixOnly { } expr {$newmtime == $modmtime ? 1 : "$newmtime != $modmtime"} } 1 -test cmdAH-24.10 {Tcl_FileObjCmd: mtime touch} winOnly { +test cmdAH-24.10 {Tcl_FileObjCmd: mtime touch} win { waitForEvenSecondForFAT set mtime [file mtime $file] after 2100; # pause two secs to notice change in mtime on FAT fs'es @@ -1204,7 +1204,7 @@ test cmdAH-24.10 {Tcl_FileObjCmd: mtime touch} winOnly { set modmtime [file mtime $file $newmtime] expr {$newmtime == $modmtime ? 1 : "$newmtime != $modmtime"} } 1 -test cmdAH-24.11 {Tcl_FileObjCmd: mtime touch with non-ascii chars} winOnly { +test cmdAH-24.11 {Tcl_FileObjCmd: mtime touch with non-ascii chars} win { waitForEvenSecondForFAT set oldfile $file # introduce some non-ascii characters. @@ -1240,7 +1240,7 @@ test cmdAH-25.2.1 {Tcl_FileObjCmd: owned} -constraints {unix} -setup { } -cleanup { removeFile touch.me /tmp } -result 1 -test cmdAH-25.3 {Tcl_FileObjCmd: owned} {unixOnly notRoot} { +test cmdAH-25.3 {Tcl_FileObjCmd: owned} {unix notRoot} { file owned / } 0 @@ -1249,14 +1249,14 @@ test cmdAH-25.3 {Tcl_FileObjCmd: owned} {unixOnly notRoot} { test cmdAH-26.1 {Tcl_FileObjCmd: readlink} { list [catch {file readlink a b} msg] $msg } {1 {wrong # args: should be "file readlink name"}} -test cmdAH-26.2 {Tcl_FileObjCmd: readlink} {unixOnly nonPortable} { +test cmdAH-26.2 {Tcl_FileObjCmd: readlink} {unix nonPortable} { file readlink $linkfile } $gorpfile -test cmdAH-26.3 {Tcl_FileObjCmd: readlink errors} {unixOnly nonPortable} { +test cmdAH-26.3 {Tcl_FileObjCmd: readlink errors} {unix nonPortable} { list [catch {file readlink _bogus_} msg] [string tolower $msg] \ [string tolower $errorCode] } {1 {could not readlink "_bogus_": no such file or directory} {posix enoent {no such file or directory}}} -test cmdAH-26.5 {Tcl_FileObjCmd: readlink errors} {winOnly nonPortable} { +test cmdAH-26.5 {Tcl_FileObjCmd: readlink errors} {win nonPortable} { list [catch {file readlink _bogus_} msg] [string tolower $msg] \ [string tolower $errorCode] } {1 {could not readlink "_bogus_": invalid argument} {posix einval {invalid argument}}} @@ -1302,7 +1302,7 @@ test cmdAH-28.4 {Tcl_FileObjCmd: stat} { file stat $gorpfile stat list $stat(nlink) $stat(size) $stat(type) } {1 12 file} -test cmdAH-28.5 {Tcl_FileObjCmd: stat} {unixOnly} { +test cmdAH-28.5 {Tcl_FileObjCmd: stat} {unix} { catch {unset stat} file stat $gorpfile stat expr $stat(mode)&0777 @@ -1325,7 +1325,7 @@ test cmdAH-28.8 {Tcl_FileObjCmd: stat} { removeFile $filename set x } 1 -test cmdAH-28.9 {Tcl_FileObjCmd: stat} winOnly { +test cmdAH-28.9 {Tcl_FileObjCmd: stat} win { # stat of root directory was failing. # don't care about answer, just that test runs. @@ -1341,7 +1341,7 @@ test cmdAH-28.9 {Tcl_FileObjCmd: stat} winOnly { file stat c:/ stat file stat c:/. stat } {} -test cmdAH-28.10 {Tcl_FileObjCmd: stat} {winOnly nonPortable} { +test cmdAH-28.10 {Tcl_FileObjCmd: stat} {win nonPortable} { # stat of root directory was failing. # don't care about answer, just that test runs. @@ -1349,7 +1349,7 @@ test cmdAH-28.10 {Tcl_FileObjCmd: stat} {winOnly nonPortable} { file stat //pop/$env(USERNAME)/ stat file stat //pop/$env(USERNAME)/. stat } {} -test cmdAH-28.11 {Tcl_FileObjCmd: stat} {winOnly nonPortable} { +test cmdAH-28.11 {Tcl_FileObjCmd: stat} {win nonPortable} { # stat of network directory was returning id of current local drive. set old [pwd] @@ -1378,7 +1378,7 @@ test cmdAH-29.1 {Tcl_FileObjCmd: type} { test cmdAH-29.2 {Tcl_FileObjCmd: type} { file type $dirfile } directory -test cmdAH-29.3.0 {Tcl_FileObjCmd: delete removes link not file} {unixOnly nonPortable} { +test cmdAH-29.3.0 {Tcl_FileObjCmd: delete removes link not file} {unix nonPortable} { set exists [list [file exists $linkfile] [file exists $gorpfile]] file delete $linkfile set exists2 [list [file exists $linkfile] [file exists $gorpfile]] @@ -1387,7 +1387,7 @@ test cmdAH-29.3.0 {Tcl_FileObjCmd: delete removes link not file} {unixOnly nonPo test cmdAH-29.3 {Tcl_FileObjCmd: type} { file type $gorpfile } file -test cmdAH-29.4 {Tcl_FileObjCmd: type} {unixOnly} { +test cmdAH-29.4 {Tcl_FileObjCmd: type} {unix} { catch {file delete $linkfile} # Unlike [exec ln -s], [file link] requires an existing target file link -symbolic $linkfile $gorpfile diff --git a/tests/cmdMZ.test b/tests/cmdMZ.test index 5adfeec..ae5725b 100644 --- a/tests/cmdMZ.test +++ b/tests/cmdMZ.test @@ -11,7 +11,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: cmdMZ.test,v 1.21 2004/03/17 18:14:17 das Exp $ +# RCS: @(#) $Id: cmdMZ.test,v 1.22 2004/06/23 15:36:55 dkf Exp $ if {[catch {package require tcltest 2.1}]} { puts stderr "Skipping tests in [info script]. tcltest 2.1 required." @@ -37,7 +37,7 @@ test cmdMZ-1.2 {Tcl_PwdObjCmd: simple pwd} { test cmdMZ-1.3 {Tcl_PwdObjCmd: simple pwd} { expr [string length pwd]>0 } 1 -test cmdMZ-1.4 {Tcl_PwdObjCmd: failure} {unixOnly nonPortable} { +test cmdMZ-1.4 {Tcl_PwdObjCmd: failure} {unix nonPortable} { # This test fails on various unix platforms (eg Linux) where # permissions caching causes this to fail. The caching is strictly # incorrect, but we have no control over that. diff --git a/tests/env.test b/tests/env.test index 909c8e2..60bb0e3 100644 --- a/tests/env.test +++ b/tests/env.test @@ -11,7 +11,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: env.test,v 1.18 2004/05/19 12:11:52 dkf Exp $ +# RCS: @(#) $Id: env.test,v 1.19 2004/06/23 15:36:55 dkf Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest 2 @@ -227,7 +227,7 @@ test env-5.4 {corner cases - unset the env array} {} { interp delete i set result } {1 a 1} -test env-5.5 {corner cases - cannot have null entries on Windows} {pcOnly} { +test env-5.5 {corner cases - cannot have null entries on Windows} {win} { set env() a catch {set env()} } {1} diff --git a/tests/exec.test b/tests/exec.test index 40289aa..dce664f 100644 --- a/tests/exec.test +++ b/tests/exec.test @@ -11,7 +11,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: exec.test,v 1.20 2004/05/25 17:44:29 dgp Exp $ +# RCS: @(#) $Id: exec.test,v 1.21 2004/06/23 15:36:55 dkf Exp $ package require tcltest 2 namespace import -force ::tcltest::* @@ -432,7 +432,7 @@ if {[testConstraint exec]} { exec [interpreter] $path(sleep) 3 } test exec-12.1 {reaping background processes} \ - {exec unixOnly nonPortable} { + {exec unix nonPortable} { for {set i 0} {$i < 20} {incr i} { exec echo foo > /dev/null & } @@ -441,7 +441,7 @@ test exec-12.1 {reaping background processes} \ lindex $msg 0 } 0 test exec-12.2 {reaping background processes} \ - {exec unixOnly nonPortable} { + {exec unix nonPortable} { exec sleep 2 | sleep 2 | sleep 2 & catch {exec ps | fgrep -i "sleep" | fgrep -i -v fgrep | wc} msg set x [lindex $msg 0] @@ -450,7 +450,7 @@ test exec-12.2 {reaping background processes} \ list $x [lindex $msg 0] } {3 0} test exec-12.3 {reaping background processes} \ - {exec unixOnly nonPortable} { + {exec unix nonPortable} { exec sleep 1000 & exec sleep 1000 & set x [exec ps | fgrep "sleep" | fgrep -v fgrep] diff --git a/tests/expr-old.test b/tests/expr-old.test index 1d7b796..85a408b 100644 --- a/tests/expr-old.test +++ b/tests/expr-old.test @@ -13,7 +13,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: expr-old.test,v 1.18 2004/05/19 20:15:31 dkf Exp $ +# RCS: @(#) $Id: expr-old.test,v 1.19 2004/06/23 15:36:56 dkf Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest 2.1 @@ -915,7 +915,7 @@ test expr-old-36.6 {ExprLooksLikeInt procedure} { set x { -22} list [catch {expr {$x+1}} msg] $msg } {0 -21} -test expr-old-36.7 {ExprLooksLikeInt procedure} {nonPortable unixOnly} { +test expr-old-36.7 {ExprLooksLikeInt procedure} {nonPortable unix} { list [catch {expr nan} msg] $msg } {1 {domain error: argument not in valid range}} test expr-old-36.8 {ExprLooksLikeInt procedure} { @@ -924,7 +924,7 @@ test expr-old-36.8 {ExprLooksLikeInt procedure} { test expr-old-36.9 {ExprLooksLikeInt procedure} { list [catch {expr 24E1} msg] $msg } {0 240.0} -test expr-old-36.10 {ExprLooksLikeInt procedure} {nonPortable unixOnly} { +test expr-old-36.10 {ExprLooksLikeInt procedure} {nonPortable unix} { list [catch {expr 78e} msg] $msg } {1 {syntax error in expression "78e"}} diff --git a/tests/expr.test b/tests/expr.test index 9a168c9..059f7f3 100644 --- a/tests/expr.test +++ b/tests/expr.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: expr.test,v 1.21 2004/05/19 20:15:31 dkf Exp $ +# RCS: @(#) $Id: expr.test,v 1.22 2004/06/23 15:36:56 dkf Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest @@ -158,12 +158,12 @@ test expr-3.6 {CompileCondExpr: error compiling false arm} { catch {expr 2>3?44:2***3} msg set msg } {syntax error in expression "2>3?44:2***3": unexpected operator *} -test expr-3.7 {CompileCondExpr: long arms & nested cond exprs} {unixOnly nonPortable} { +test expr-3.7 {CompileCondExpr: long arms & nested cond exprs} {unix nonPortable} { puts "Note: doing test expr-3.7 which can take several minutes to run" hello_world } {Hello world} catch {unset xxx} -test expr-3.8 {CompileCondExpr: long arms & nested cond exprs} {unixOnly nonPortable} { +test expr-3.8 {CompileCondExpr: long arms & nested cond exprs} {unix nonPortable} { puts "Note: doing test expr-3.8 which can take several minutes to run" do_twelve_days } 2358 diff --git a/tests/fCmd.test b/tests/fCmd.test index 74e7ae3..38c3d46 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.40 2004/05/25 08:27:42 dkf Exp $ +# RCS: @(#) $Id: fCmd.test,v 1.41 2004/06/23 15:36:56 dkf Exp $ # if {[lsearch [namespace children] ::tcltest] == -1} { @@ -280,7 +280,7 @@ test fCmd-4.10 {TclFileMakeDirsCmd: exists, is dir} {notRoot} { list $x [file exists td1] } {1 1} test fCmd-4.11 {TclFileMakeDirsCmd: doesn't exist: errno != ENOENT} \ - {unixOnly notRoot testchmod} { + {unix notRoot testchmod} { cleanup file mkdir td1/td2/td3 testchmod 000 td1/td2 @@ -295,7 +295,7 @@ test fCmd-4.13 {TclFileMakeDirsCmd: doesn't exist: errno == ENOENT} {notRoot} { list $x [file exists td1] } {0 1} test fCmd-4.14 {TclFileMakeDirsCmd: TclpCreateDirectory fails} \ - {unixOnly notRoot} { + {unix notRoot} { cleanup file delete -force foo file mkdir foo @@ -375,7 +375,7 @@ test fCmd-5.11 {TclFileDeleteCmd: TclpRemoveDirectory with cwd inside} {notRoot} cd $dir lappend res [file exists td1] $msg } {0 0 {}} -test fCmd-5.12 {TclFileDeleteCmd: TclpRemoveDirectory with bad perms} {unixOnly} { +test fCmd-5.12 {TclFileDeleteCmd: TclpRemoveDirectory with bad perms} {unix} { cleanup file mkdir [file join td1 td2] #exec chmod u-rwx [file join td1 td2] @@ -406,7 +406,7 @@ test fCmd-6.5 {CopyRenameOneFile: lstat(target) != 0} {notRoot} { file rename tf1 tf2 glob tf* } {tf2} -test fCmd-6.6 {CopyRenameOneFile: errno != ENOENT} {unixOnly notRoot testchmod} { +test fCmd-6.6 {CopyRenameOneFile: errno != ENOENT} {unix notRoot testchmod} { cleanup file mkdir td1 testchmod 000 td1 @@ -415,12 +415,12 @@ test fCmd-6.6 {CopyRenameOneFile: errno != ENOENT} {unixOnly notRoot testchmod} testchmod 755 td1 set msg } {1 {error renaming "tf1" to "td1/tf1": permission denied}} -test fCmd-6.7 {CopyRenameOneFile: errno != ENOENT} {pcOnly 95} { +test fCmd-6.7 {CopyRenameOneFile: errno != ENOENT} {win 95} { cleanup createfile tf1 list [catch {file rename tf1 $long} msg] $msg } [subst {1 {error renaming "tf1" to "$long": file name too long}}] -test fCmd-6.9 {CopyRenameOneFile: errno == ENOENT} {unixOnly notRoot} { +test fCmd-6.9 {CopyRenameOneFile: errno == ENOENT} {unix notRoot} { cleanup createfile tf1 file rename tf1 tf2 @@ -489,13 +489,13 @@ test fCmd-6.18 {CopyRenameOneFile: errno != EXDEV} -setup { file rename -force td2 td1 } -returnCodes error -match glob -result \ [subst {error renaming "td2" to "[file join td1 td2]": file *}] -test fCmd-6.19 {CopyRenameOneFile: errno == EXDEV} {unixOnly notRoot} { +test fCmd-6.19 {CopyRenameOneFile: errno == EXDEV} {unix notRoot} { cleanup /tmp createfile tf1 file rename tf1 /tmp glob -nocomplain tf* /tmp/tf1 } {/tmp/tf1} -test fCmd-6.20 {CopyRenameOneFile: errno == EXDEV} {pcOnly} { +test fCmd-6.20 {CopyRenameOneFile: errno == EXDEV} {win} { catch {file delete -force c:/tcl8975@ d:/tcl8975@} file mkdir c:/tcl8975@ if [catch {file rename c:/tcl8975@ d:/}] { @@ -508,21 +508,21 @@ test fCmd-6.20 {CopyRenameOneFile: errno == EXDEV} {pcOnly} { set msg } {d:/tcl8975@} test fCmd-6.21 {CopyRenameOneFile: copy/rename: S_ISDIR(source)} \ - {unixOnly notRoot} { + {unix notRoot} { cleanup /tmp file mkdir td1 file rename td1 /tmp glob -nocomplain td* /tmp/td* } {/tmp/td1} test fCmd-6.22 {CopyRenameOneFile: copy/rename: !S_ISDIR(source)} \ - {unixOnly notRoot} { + {unix notRoot} { cleanup /tmp createfile tf1 file rename tf1 /tmp glob -nocomplain tf* /tmp/tf* } {/tmp/tf1} test fCmd-6.23 {CopyRenameOneFile: TclpCopyDirectory failed} \ - {unixOnly notRoot xdev} { + {unix notRoot xdev} { cleanup /tmp file mkdir td1/td2/td3 file attributes td1 -permissions 0000 @@ -531,7 +531,7 @@ test fCmd-6.23 {CopyRenameOneFile: TclpCopyDirectory failed} \ set msg } {1 {error renaming "td1": permission denied}} test fCmd-6.24 {CopyRenameOneFile: error uses original name} \ - {unixOnly notRoot} { + {unix notRoot} { cleanup file mkdir ~/td1/td2 set td1name [file join [file dirname ~] [file tail ~] td1] @@ -542,7 +542,7 @@ test fCmd-6.24 {CopyRenameOneFile: error uses original name} \ set msg } {1 {error copying "~/td1": permission denied}} test fCmd-6.25 {CopyRenameOneFile: error uses original name} \ - {unixOnly notRoot} { + {unix notRoot} { cleanup file mkdir td2 file mkdir ~/td1 @@ -554,7 +554,7 @@ test fCmd-6.25 {CopyRenameOneFile: error uses original name} \ set msg } {1 {error copying "td2" to "~/td1/td2": permission denied}} test fCmd-6.26 {CopyRenameOneFile: doesn't use original name} \ - {unixOnly notRoot} { + {unix notRoot} { cleanup file mkdir ~/td1/td2 set td2name [file join [file dirname ~] [file tail ~] td1 td2] @@ -565,7 +565,7 @@ test fCmd-6.26 {CopyRenameOneFile: doesn't use original name} \ set msg } "1 {error copying \"~/td1\" to \"td1\": \"[file join [file dirname ~] [file tail ~] td1 td2]\": permission denied}" test fCmd-6.27 {CopyRenameOneFile: TclpCopyDirectory failed} \ - {unixOnly notRoot xdev} { + {unix notRoot xdev} { cleanup /tmp file mkdir td1/td2/td3 file mkdir /tmp/td1 @@ -573,7 +573,7 @@ test fCmd-6.27 {CopyRenameOneFile: TclpCopyDirectory failed} \ list [catch {file rename -force td1 /tmp} msg] $msg } {1 {error renaming "td1" to "/tmp/td1": file already exists}} test fCmd-6.28 {CopyRenameOneFile: TclpCopyDirectory failed} \ - {unixOnly notRoot xdev} { + {unix notRoot xdev} { cleanup /tmp file mkdir td1/td2/td3 file attributes td1/td2/td3 -permissions 0000 @@ -582,14 +582,14 @@ test fCmd-6.28 {CopyRenameOneFile: TclpCopyDirectory failed} \ set msg } {1 {error renaming "td1" to "/tmp/td1": "td1/td2/td3": permission denied}} test fCmd-6.29 {CopyRenameOneFile: TclpCopyDirectory passed} \ - {unixOnly notRoot xdev} { + {unix notRoot xdev} { cleanup /tmp file mkdir td1/td2/td3 file rename td1 /tmp glob td* /tmp/td1/t* } {/tmp/td1/td2} test fCmd-6.30 {CopyRenameOneFile: TclpRemoveDirectory failed} \ - {unixOnly notRoot} { + {unix notRoot} { cleanup file mkdir foo/bar file attr foo -perm 040555 @@ -601,7 +601,7 @@ test fCmd-6.30 {CopyRenameOneFile: TclpRemoveDirectory failed} \ list $catchResult $msg } {1 { permission denied}} test fCmd-6.31 {CopyRenameOneFile: TclpDeleteFile passed} \ - {unixOnly notRoot xdev} { + {unix notRoot xdev} { catch {cleanup /tmp} file mkdir /tmp/td1 createfile /tmp/td1/tf1 @@ -642,7 +642,7 @@ test fCmd-7.5 {FileForceOption: multiple times through loop} {notRoot} { } {1 {no files matched glob patterns "-- -force"}} test fCmd-8.1 {FileBasename: basename of ~user: argc == 1 && *path == ~} \ - {unixOnly notRoot knownBug} { + {unix notRoot knownBug} { # Labelled knownBug because it is dangerous [Bug: 3881] file mkdir td1 file attr td1 -perm 040000 @@ -651,7 +651,7 @@ test fCmd-8.1 {FileBasename: basename of ~user: argc == 1 && *path == ~} \ set result } "1 {error renaming \"~$user\" to \"td1/[file tail ~$user]\": permission denied}" test fCmd-8.2 {FileBasename: basename of ~user: argc == 1 && *path == ~} \ - {unixOnly notRoot} { + {unix notRoot} { string equal [file tail ~$user] ~$user } 0 test fCmd-8.3 {file copy and path translation: ensure correct error} { @@ -660,7 +660,7 @@ test fCmd-8.3 {file copy and path translation: ensure correct error} { "error copying \"~\" to \"[file join this file doesnt exist]\":\ no such file or directory"] -test fCmd-9.1 {file rename: comprehensive: EACCES} {unixOnly notRoot} { +test fCmd-9.1 {file rename: comprehensive: EACCES} {unix notRoot} { cleanup file mkdir td1 file mkdir td2 @@ -1173,7 +1173,7 @@ test fCmd-12.7 {renamefile: renaming directory into offspring} {notRoot} { set result } {1} -test fCmd-12.8 {renamefile: generic error} {unixOnly notRoot} { +test fCmd-12.8 {renamefile: generic error} {unix notRoot} { catch {file delete -force -- tfa} file mkdir tfa file mkdir tfa/dir @@ -1185,7 +1185,7 @@ test fCmd-12.8 {renamefile: generic error} {unixOnly notRoot} { } {1} -test fCmd-12.9 {renamefile: moving a file across volumes} {unixOnly notRoot} { +test fCmd-12.9 {renamefile: moving a file across volumes} {unix notRoot} { catch {file delete -force -- tfa /tmp/tfa} set s [createfile tfa ] file rename tfa /tmp @@ -1195,7 +1195,7 @@ test fCmd-12.9 {renamefile: moving a file across volumes} {unixOnly notRoot} { } {1} test fCmd-12.10 {renamefile: moving a directory across volumes } \ - {unixOnly notRoot} { + {unix notRoot} { catch {file delete -force -- tfad /tmp/tfad} file mkdir tfad set s [createfile tfad/a ] @@ -1375,7 +1375,7 @@ test fCmd-14.7 {copyfile: copy directory succeeding} {notRoot} { set result } {1} -test fCmd-14.8 {copyfile: copy directory failing} {unixOnly notRoot} { +test fCmd-14.8 {copyfile: copy directory failing} {unix notRoot} { catch {file delete -force -- tfa} file mkdir tfa/dir/a/b/c file attributes tfa/dir -permissions 0000 @@ -1417,7 +1417,7 @@ test fCmd-15.3 {TclMakeDirsCmd: - two directories} {notRoot} { set result } {1} -test fCmd-15.4 {TclMakeDirsCmd - stat failing} {unixOnly notRoot} { +test fCmd-15.4 {TclMakeDirsCmd - stat failing} {unix notRoot} { catch {file delete -force -- tfa} file mkdir tfa createfile tfa/file @@ -1524,7 +1524,7 @@ test fCmd-16.8 {remove a normal file } {notRoot} { set result } {1} -test fCmd-16.9 {error while deleting file } {unixOnly notRoot} { +test fCmd-16.9 {error while deleting file } {unix notRoot} { catch {file delete -force -- tfa} file mkdir tfa createfile tfa/a @@ -1555,7 +1555,7 @@ test fCmd-16.11 {TclFileDeleteCmd: removing a nonexistant file} {notRoot} { } {1} # More coverage tests for mkpath() - test fCmd-17.1 {mkdir stat failing on target but not ENOENT} {unixOnly notRoot} { + test fCmd-17.1 {mkdir stat failing on target but not ENOENT} {unix notRoot} { catch {file delete -force -- tfa1} file mkdir tfa1 file attributes tfa1 -permissions 0555 @@ -1656,7 +1656,7 @@ test fCmd-18.5 {TclFileRenameCmd: attempt to replace dir with non-dir} {notRoot} # # On Windows there is no easy way to determine if two files are the same # -test fCmd-18.6 {TclFileRenameCmd: rename a file to itself} {unixOnly notRoot} { +test fCmd-18.6 {TclFileRenameCmd: rename a file to itself} {unix notRoot} { catch {file delete -force -- tfa} set s [createfile tfa] set r1 [catch {file rename tfa tfa}] @@ -1712,7 +1712,7 @@ test fCmd-18.11 {TclFileRenameCmd: rename a non-existant file} {notRoot} { } {1} test fCmd-18.12 {TclFileRenameCmd : rename a symbolic link to file} \ - {unixOnly notRoot} { + {unix notRoot} { catch {file delete -force -- tfa1 tfa2 tfa3} set s [createfile tfa1] @@ -1725,7 +1725,7 @@ test fCmd-18.12 {TclFileRenameCmd : rename a symbolic link to file} \ } {1} test fCmd-18.13 {TclFileRenameCmd : rename a symbolic link to dir} \ - {unixOnly notRoot} { + {unix notRoot} { catch {file delete -force -- tfa1 tfa2 tfa3} file mkdir tfa1 @@ -1738,7 +1738,7 @@ test fCmd-18.13 {TclFileRenameCmd : rename a symbolic link to dir} \ } {1} test fCmd-18.14 {TclFileRenameCmd : rename a path with sym link} \ - {unixOnly notRoot} { + {unix notRoot} { catch {file delete -force -- tfa1 tfa2 tfa3} file mkdir tfa1/a/b/c/d @@ -1755,7 +1755,7 @@ test fCmd-18.14 {TclFileRenameCmd : rename a path with sym link} \ } {1} test fCmd-18.15 {TclFileRenameCmd : rename a file to a symlink dir} \ - {unixOnly notRoot} { + {unix notRoot} { catch {file delete -force -- tfa1 tfa2 tfalink} file mkdir tfa1 @@ -1768,7 +1768,7 @@ test fCmd-18.15 {TclFileRenameCmd : rename a file to a symlink dir} \ set result } {1} -test fCmd-18.16 {TclFileRenameCmd: rename a dangling symlink} {unixOnly notRoot} { +test fCmd-18.16 {TclFileRenameCmd: rename a dangling symlink} {unix notRoot} { catch {file delete -force -- tfa1 tfalink} file mkdir tfa1 @@ -1791,7 +1791,7 @@ test fCmd-19.1 {remove empty directory} {notRoot} { file exists tfa } {0} -test fCmd-19.2 {rmdir error besides EEXIST} {unixOnly notRoot} { +test fCmd-19.2 {rmdir error besides EEXIST} {unix notRoot} { catch {file delete -force -- tfa} file mkdir tfa file mkdir tfa/a @@ -1821,7 +1821,7 @@ test fCmd-19.3 {recursive remove} {notRoot} { # test fCmd-20.1 {TraverseUnixTree : failure opening a subdirectory directory } \ - {unixOnly notRoot} { + {unix notRoot} { catch {file delete -force -- tfa} file mkdir tfa file mkdir tfa/a @@ -1904,7 +1904,7 @@ test fCmd-21.6 {copy: mixed dirs and files into directory} \ set result } {1} -test fCmd-21.7.1 {TclCopyFilesCmd: copy a dangling link} {unixOnly notRoot dontCopyLinks} { +test fCmd-21.7.1 {TclCopyFilesCmd: copy a dangling link} {unix notRoot dontCopyLinks} { file mkdir tfad1 file link -symbolic tfalink tfad1 file delete tfad1 @@ -1912,7 +1912,7 @@ test fCmd-21.7.1 {TclCopyFilesCmd: copy a dangling link} {unixOnly notRoot dontC file delete -force tfalink tfalink2 set result } {1 {error copying "tfalink": the target of this link doesn't exist}} -test fCmd-21.7.2 {TclCopyFilesCmd: copy a dangling link} {unixOnly notRoot} { +test fCmd-21.7.2 {TclCopyFilesCmd: copy a dangling link} {unix notRoot} { file mkdir tfad1 file link -symbolic tfalink tfad1 file delete tfad1 @@ -1922,7 +1922,7 @@ test fCmd-21.7.2 {TclCopyFilesCmd: copy a dangling link} {unixOnly notRoot} { set result } {1} -test fCmd-21.8.1 {TclCopyFilesCmd: copy a link } {unixOnly notRoot dontCopyLinks} { +test fCmd-21.8.1 {TclCopyFilesCmd: copy a link } {unix notRoot dontCopyLinks} { file mkdir tfad1 file link -symbolic tfalink tfad1 file copy tfalink tfalink2 @@ -1933,7 +1933,7 @@ test fCmd-21.8.1 {TclCopyFilesCmd: copy a link } {unixOnly notRoot dontCopyLinks file delete -force tfad1 tfalink tfalink2 set result } {1} -test fCmd-21.8.2 {TclCopyFilesCmd: copy a link } {unixOnly notRoot} { +test fCmd-21.8.2 {TclCopyFilesCmd: copy a link } {unix notRoot} { file mkdir tfad1 file link -symbolic tfalink tfad1 file copy tfalink tfalink2 @@ -1945,7 +1945,7 @@ test fCmd-21.8.2 {TclCopyFilesCmd: copy a link } {unixOnly notRoot} { set result } {1} -test fCmd-21.9 {TclCopyFilesCmd: copy dir with a link in it} {unixOnly notRoot} { +test fCmd-21.9 {TclCopyFilesCmd: copy dir with a link in it} {unix notRoot} { file mkdir tfad1 file link -symbolic tfad1/tfalink "[pwd]/tfad1" file copy tfad1 tfad2 @@ -1998,7 +1998,7 @@ test fCmd-22.1 {TclpRenameFile: rename and overwrite in a single dir} {notRoot} set result } {1} -test fCmd-22.2 {TclpRenameFile: attempt to overwrite itself} {unixOnly notRoot} { +test fCmd-22.2 {TclpRenameFile: attempt to overwrite itself} {unix notRoot} { catch {file delete -force -- tfa1} set s [createfile tfa1] file rename -force tfa1 tfa1 @@ -2112,7 +2112,7 @@ test fCmd-25.3 {TclMacCopyDirectory: copying dirs between different dirs} {notRo # Functionality tests for TclDeleteFilesCmd # -test fCmd-26.1 {TclDeleteFilesCmd: delete symlink} {unixOnly notRoot} { +test fCmd-26.1 {TclDeleteFilesCmd: delete symlink} {unix notRoot} { catch {file delete -force -- tfad1 tfad2} file mkdir tfad1 @@ -2127,7 +2127,7 @@ test fCmd-26.1 {TclDeleteFilesCmd: delete symlink} {unixOnly notRoot} { set result } {1} -test fCmd-26.2 {TclDeleteFilesCmd: delete dir with symlink} {unixOnly notRoot} { +test fCmd-26.2 {TclDeleteFilesCmd: delete dir with symlink} {unix notRoot} { catch {file delete -force -- tfad1 tfad2} file mkdir tfad1 @@ -2143,7 +2143,7 @@ test fCmd-26.2 {TclDeleteFilesCmd: delete dir with symlink} {unixOnly notRoot} { set result } {1} -test fCmd-26.3 {TclDeleteFilesCmd: delete dangling symlink} {unixOnly notRoot} { +test fCmd-26.3 {TclDeleteFilesCmd: delete dangling symlink} {unix notRoot} { catch {file delete -force -- tfad1 tfad2} file mkdir tfad1 @@ -2245,7 +2245,7 @@ test fCmd-28.5 {file link: source already exists} {linkDirectory} { set res } {1 {could not create new link "abc.dir": that path already exists}} -test fCmd-28.6 {file link: unsupported operation} {linkDirectory winOnly} { +test fCmd-28.6 {file link: unsupported operation} {linkDirectory win} { cd [temporaryDirectory] set res [list [catch {file link -hard abc.link abc.dir} msg] $msg] cd [workingDirectory] @@ -2259,7 +2259,7 @@ test fCmd-28.7 {file link: source already exists} {linkFile} { set res } {1 {could not create new link "abc.file": that path already exists}} -test fCmd-28.8 {file link} {linkFile winOnly} { +test fCmd-28.8 {file link} {linkFile win} { cd [temporaryDirectory] set res [list [catch {file link -symbolic abc.link abc.file} msg] $msg] cd [workingDirectory] @@ -2399,26 +2399,26 @@ test fCmd-28.18 {file link: glob -type d} {linkDirectory} { set res } [lsort [list abc.link abc.dir abc2.dir]] -test fCmd-28.19 {file link: relative paths} {winOnly linkDirectory} { +test fCmd-28.19 {file link: relative paths} {win linkDirectory} { cd [temporaryDirectory] file mkdir d1/d2/d3 set res [list [catch {file link d1/l2 d1/d2} err] $err] lappend res [catch {file delete -force d1} err] $err } {0 d1/d2 0 {}} -test fCmd-28.20 {file link: relative paths} {unixOnly linkDirectory} { +test fCmd-28.20 {file link: relative paths} {unix linkDirectory} { cd [temporaryDirectory] file mkdir d1/d2/d3 list [catch {file link d1/l2 d1/d2} res] $res } {1 {could not create new link "d1/l2": target "d1/d2" doesn't exist}} -test fCmd-28.21 {file link: relative paths} {unixOnly linkDirectory} { +test fCmd-28.21 {file link: relative paths} {unix linkDirectory} { cd [temporaryDirectory] file mkdir d1/d2/d3 list [catch {file link d1/l2 d2} res] $res } {0 d2} -test fCmd-28.22 {file link: relative paths} {unixOnly linkDirectory} { +test fCmd-28.22 {file link: relative paths} {unix linkDirectory} { cd [temporaryDirectory] file mkdir d1/d2/d3 catch {file delete -force d1/l2} diff --git a/tests/fileName.test b/tests/fileName.test index a5f077d..9c6cbb1 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.42 2004/05/19 20:15:31 dkf Exp $ +# RCS: @(#) $Id: fileName.test,v 1.43 2004/06/23 15:36:56 dkf Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest @@ -517,7 +517,7 @@ test filename-9.19.1 {Tcl_JoinPath: win} {testsetplatform} { [file join C:/blah {foo\bar}] \ [file join C:/blah C:/blah {foo\bar}] } {foo/bar C:/blah/foo/bar C:/blah/foo/bar} -test filename-9.19.2 {Tcl_JoinPath: win} {testsetplatform winOnly} { +test filename-9.19.2 {Tcl_JoinPath: win} {testsetplatform win} { testsetplatform win set res {} lappend res \ @@ -666,11 +666,11 @@ if {[testConstraint testsetplatform]} { testsetplatform $platform } -test filename-10.23 {Tcl_TranslateFileName} {unixOnly nonPortable} { +test filename-10.23 {Tcl_TranslateFileName} {unix nonPortable} { # this test fails if ~ouster is not /home/ouster list [catch {testtranslatefilename ~ouster} msg] $msg } {0 /home/ouster} -test filename-10.24 {Tcl_TranslateFileName} {unixOnly nonPortable} { +test filename-10.24 {Tcl_TranslateFileName} {unix nonPortable} { # this test fails if ~ouster is not /home/ouster list [catch {testtranslatefilename ~ouster/foo} msg] $msg } {0 /home/ouster/foo} @@ -761,7 +761,7 @@ test filename-11.16 {Tcl_GlobCmd} { set globname "globTest" set horribleglobname "glob\[\{Test" -test filename-11.17 {Tcl_GlobCmd} {unixOnly} { +test filename-11.17 {Tcl_GlobCmd} {unix} { list [catch {lsort [glob -directory $globname *]} msg] $msg } [list 0 [lsort [list [file join $globname a1] [file join $globname a2]\ [file join $globname a3]\ @@ -769,7 +769,7 @@ test filename-11.17 {Tcl_GlobCmd} {unixOnly} { [file join $globname x,z1.c]\ [file join $globname x1.c]\ [file join $globname y1.c] [file join $globname z1.c]]]] -test filename-11.17.1 {Tcl_GlobCmd} {pcOnly} { +test filename-11.17.1 {Tcl_GlobCmd} {win} { list [catch {lsort [glob -directory $globname *]} msg] $msg } [list 0 [lsort [list [file join $globname a1] [file join $globname a2]\ [file join $globname .1]\ @@ -891,7 +891,7 @@ test filename-11.17.8 {Tcl_GlobCmd: broken link and glob -l} {symbolicLinkFile} file delete [file join $globname link] set ret } [list 0 [list [file join $globname link]]] -test filename-11.18 {Tcl_GlobCmd} {unixOnly} { +test filename-11.18 {Tcl_GlobCmd} {unix} { list [catch {lsort [glob -path $globname/ *]} msg] $msg } [list 0 [lsort [list [file join $globname a1] [file join $globname a2]\ [file join $globname a3]\ @@ -899,7 +899,7 @@ test filename-11.18 {Tcl_GlobCmd} {unixOnly} { [file join $globname x,z1.c]\ [file join $globname x1.c]\ [file join $globname y1.c] [file join $globname z1.c]]]] -test filename-11.18.1 {Tcl_GlobCmd} {pcOnly} { +test filename-11.18.1 {Tcl_GlobCmd} {win} { list [catch {lsort [glob -path $globname/ *]} msg] $msg } [list 0 [lsort [list [file join $globname a1] [file join $globname a2]\ [file join $globname .1]\ @@ -908,7 +908,7 @@ test filename-11.18.1 {Tcl_GlobCmd} {pcOnly} { [file join $globname x,z1.c]\ [file join $globname x1.c]\ [file join $globname y1.c] [file join $globname z1.c]]]] -test filename-11.19 {Tcl_GlobCmd} {unixOnly} { +test filename-11.19 {Tcl_GlobCmd} {unix} { list [catch {lsort [glob -join -path \ [string range $globname 0 5] * *]} msg] $msg } [list 0 [lsort [list [file join $globname a1] [file join $globname a2]\ @@ -917,7 +917,7 @@ test filename-11.19 {Tcl_GlobCmd} {unixOnly} { [file join $globname x,z1.c]\ [file join $globname x1.c]\ [file join $globname y1.c] [file join $globname z1.c]]]] -test filename-11.19.1 {Tcl_GlobCmd} {pcOnly} { +test filename-11.19.1 {Tcl_GlobCmd} {win} { list [catch {lsort [glob -join -path \ [string range $globname 0 5] * *]} msg] $msg } [list 0 [lsort [list [file join $globname a1] [file join $globname a2]\ @@ -951,7 +951,7 @@ if {[file exists $horribleglobname]} { file rename globTest $horribleglobname set globname $horribleglobname -test filename-11.22 {Tcl_GlobCmd} {unixOnly} { +test filename-11.22 {Tcl_GlobCmd} {unix} { list [catch {lsort [glob -dir $globname *]} msg] $msg } [list 0 [lsort [list [file join $globname a1] [file join $globname a2]\ [file join $globname a3]\ @@ -959,7 +959,7 @@ test filename-11.22 {Tcl_GlobCmd} {unixOnly} { [file join $globname x,z1.c]\ [file join $globname x1.c]\ [file join $globname y1.c] [file join $globname z1.c]]]] -test filename-11.22.1 {Tcl_GlobCmd} {pcOnly} { +test filename-11.22.1 {Tcl_GlobCmd} {win} { list [catch {lsort [glob -dir $globname *]} msg] $msg } [list 0 [lsort [list [file join $globname a1] [file join $globname a2]\ [file join $globname .1]\ @@ -968,7 +968,7 @@ test filename-11.22.1 {Tcl_GlobCmd} {pcOnly} { [file join $globname x,z1.c]\ [file join $globname x1.c]\ [file join $globname y1.c] [file join $globname z1.c]]]] -test filename-11.23 {Tcl_GlobCmd} {unixOnly} { +test filename-11.23 {Tcl_GlobCmd} {unix} { list [catch {lsort [glob -path $globname/ *]} msg] $msg } [list 0 [lsort [list [file join $globname a1] [file join $globname a2]\ [file join $globname a3]\ @@ -976,7 +976,7 @@ test filename-11.23 {Tcl_GlobCmd} {unixOnly} { [file join $globname x,z1.c]\ [file join $globname x1.c]\ [file join $globname y1.c] [file join $globname z1.c]]]] -test filename-11.23.1 {Tcl_GlobCmd} {pcOnly} { +test filename-11.23.1 {Tcl_GlobCmd} {win} { list [catch {lsort [glob -path $globname/ *]} msg] $msg } [list 0 [lsort [list [file join $globname a1] [file join $globname a2]\ [file join $globname .1]\ @@ -985,7 +985,7 @@ test filename-11.23.1 {Tcl_GlobCmd} {pcOnly} { [file join $globname x,z1.c]\ [file join $globname x1.c]\ [file join $globname y1.c] [file join $globname z1.c]]]] -test filename-11.24 {Tcl_GlobCmd} {unixOnly} { +test filename-11.24 {Tcl_GlobCmd} {unix} { list [catch {lsort [glob -join -path \ [string range $globname 0 5] * *]} msg] $msg } [list 0 [lsort [list [file join $globname a1] [file join $globname a2]\ @@ -994,7 +994,7 @@ test filename-11.24 {Tcl_GlobCmd} {unixOnly} { [file join $globname x,z1.c]\ [file join $globname x1.c]\ [file join $globname y1.c] [file join $globname z1.c]]]] -test filename-11.24.1 {Tcl_GlobCmd} {pcOnly} { +test filename-11.24.1 {Tcl_GlobCmd} {win} { list [catch {lsort [glob -join -path \ [string range $globname 0 5] * *]} msg] $msg } [list 0 [lsort [list [file join $globname a1] [file join $globname a2]\ @@ -1126,16 +1126,16 @@ test filename-12.1.1 {simple globbing} {unixOrPc} { test filename-12.1.2 {simple globbing} {unixOrPc} { list [catch {glob -types d {}} msg] $msg } {0 .} -test filename-12.1.3 {simple globbing} {unixOnly} { +test filename-12.1.3 {simple globbing} {unix} { list [catch {glob -types hidden {}} msg] $msg } {0 .} -test filename-12.1.4 {simple globbing} {pcOnly} { +test filename-12.1.4 {simple globbing} {win} { list [catch {glob -types hidden {}} msg] $msg } {1 {no files matched glob pattern ""}} -test filename-12.1.5 {simple globbing} {pcOnly} { +test filename-12.1.5 {simple globbing} {win} { list [catch {glob -types hidden c:/} msg] $msg } {1 {no files matched glob pattern "c:/"}} -test filename-12.1.6 {simple globbing} {pcOnly} { +test filename-12.1.6 {simple globbing} {win} { list [catch {glob c:/} msg] $msg } {0 c:/} test filename-12.3 {simple globbing} { @@ -1154,7 +1154,7 @@ test filename-12.5 {simple globbing} { test filename-12.6 {simple globbing} { list [catch {glob globTest\\/\\x1.c} msg] $msg } "0 $globPreResult$x1" -test filename-12.7 {globbing at filesystem root} {unixOnly} { +test filename-12.7 {globbing at filesystem root} {unix} { set res1 [glob -nocomplain /*] set res2 [glob -path / *] set equal [string equal $res1 $res2] @@ -1163,7 +1163,7 @@ test filename-12.7 {globbing at filesystem root} {unixOnly} { } set equal } {1} -test filename-12.8 {globbing at filesystem root} {unixOnly} { +test filename-12.8 {globbing at filesystem root} {unix} { set dir [lindex [glob -type d /*] 0] set first [string range $dir 0 1] set res1 [glob -nocomplain ${first}*] @@ -1174,7 +1174,7 @@ test filename-12.8 {globbing at filesystem root} {unixOnly} { } set equal } {1} -test filename-12.9 {globbing at filesystem root} {winOnly} { +test filename-12.9 {globbing at filesystem root} {win} { # Can't grab just anything from 'file volumes' because we need a dir # that has subdirs - assume that C:/ exists across Windows machines. set dir [lindex [glob -type d C:/*] 0] @@ -1188,7 +1188,7 @@ test filename-12.9 {globbing at filesystem root} {winOnly} { set equal } {1} -test filename-12.10 {globbing with volume relative paths} {winOnly} { +test filename-12.10 {globbing with volume relative paths} {win} { set dir [lindex [glob -type d C:/*] 0] set pwd [pwd] cd C:/ @@ -1276,10 +1276,10 @@ cd $savepwd file rename [file join globTestContext globTest] globTest file delete globTestContext -test filename-14.7 {asterisks, question marks, and brackets} {unixOnly} { +test filename-14.7 {asterisks, question marks, and brackets} {unix} { lsort [glob globTest/*] } {globTest/a1 globTest/a2 globTest/a3 {globTest/weird name.c} globTest/x,z1.c globTest/x1.c globTest/y1.c globTest/z1.c} -test filename-14.7.1 {asterisks, question marks, and brackets} {pcOnly} { +test filename-14.7.1 {asterisks, question marks, and brackets} {win} { lsort [glob globTest/*] } {globTest/.1 globTest/a1 globTest/a2 globTest/a3 {globTest/weird name.c} globTest/x,z1.c globTest/x1.c globTest/y1.c globTest/z1.c} test filename-14.9 {asterisks, question marks, and brackets} {unixOrPc} { @@ -1314,23 +1314,23 @@ test filename-14.21 {asterisks, question marks, and brackets} { test filename-14.22 {asterisks, question marks, and brackets} { list [catch {glob goo/* x*z foo?q} msg] $msg } {1 {no files matched glob patterns "goo/* x*z foo?q"}} -test filename-14.23 {slash globbing} {unixOnly} { +test filename-14.23 {slash globbing} {unix} { glob / } / -test filename-14.23.2 {slash globbing} {pcOnly} { +test filename-14.23.2 {slash globbing} {win} { glob / } [file norm /] -test filename-14.24 {slash globbing} {pcOnly} { +test filename-14.24 {slash globbing} {win} { glob {\\} } [file norm /] -test filename-14.25 {type specific globbing} {unixOnly} { +test filename-14.25 {type specific globbing} {unix} { list [catch {lsort [glob -dir globTest -types f *]} msg] $msg } [list 0 [lsort [list \ [file join $globname "weird name.c"]\ [file join $globname x,z1.c]\ [file join $globname x1.c]\ [file join $globname y1.c] [file join $globname z1.c]]]] -test filename-14.25.1 {type specific globbing} {pcOnly} { +test filename-14.25.1 {type specific globbing} {win} { list [catch {lsort [glob -dir globTest -types f *]} msg] $msg } [list 0 [lsort [list \ [file join $globname .1]\ @@ -1349,14 +1349,14 @@ unset globname # access by owner, so the following test is not portable. catch {file attributes globTest/a1 -permissions 0000} -test filename-15.1 {unix specific globbing} {unixOnly nonPortable} { +test filename-15.1 {unix specific globbing} {unix nonPortable} { string tolower [list [catch {glob globTest/a1/*} msg] $msg $errorCode] } {1 {couldn't read directory "globtest/a1": permission denied} {posix eacces {permission denied}}} -test filename-15.2 {unix specific no complain: no errors} {unixOnly nonPortable} { +test filename-15.2 {unix specific no complain: no errors} {unix nonPortable} { glob -nocomplain globTest/a1/* } {} test filename-15.3 {unix specific no complain: no errors, good result} \ - {unixOnly nonPortable} { + {unix nonPortable} { # test fails because if an error occur , the interp's result # is reset... glob -nocomplain globTest/a2 globTest/a1/* globTest/a3 @@ -1364,7 +1364,7 @@ test filename-15.3 {unix specific no complain: no errors, good result} \ catch {file attributes globTest/a1 -permissions 0755} test filename-15.4 {unix specific no complain: no errors, good result} \ - {unixOnly nonPortable} { + {unix nonPortable} { # test fails because if an error occurs, the interp's result # is reset... or you don't run at scriptics where the # outser and welch users exists @@ -1376,11 +1376,11 @@ test filename-15.4.1 {no complain: no errors, good result} { string equal [glob -nocomplain ~wontexist ~blah ~] \ [glob -nocomplain ~ ~blah ~wontexist] } {1} -test filename-15.5 {unix specific globbing} {unixOnly nonPortable} { +test filename-15.5 {unix specific globbing} {unix nonPortable} { glob ~ouster/.csh* } "/home/ouster/.cshrc" catch {close [open globTest/odd\\\[\]*?\{\}name w]} -test filename-15.6 {unix specific globbing} {unixOnly} { +test filename-15.6 {unix specific globbing} {unix} { global env set temp $env(HOME) set env(HOME) $env(HOME)/globTest/odd\\\[\]*?\{\}name @@ -1389,7 +1389,7 @@ test filename-15.6 {unix specific globbing} {unixOnly} { set result } [list 0 [list [lindex [glob ~] 0]/globTest/odd\\\[\]*?\{\}name]] catch {file delete -force globTest/odd\\\[\]*?\{\}name} -test filename-15.7 {win specific globbing} {winOnly} { +test filename-15.7 {win specific globbing} {win} { if {[string index [glob ~] end] == "/"} { set res "glob ~ is [glob ~] but shouldn't end in a separator" } else { @@ -1409,7 +1409,7 @@ test filename-15.8 {win and unix specific globbing} {unixOrWin} { # The following tests are only valid for Windows systems. set oldDir [pwd] -if {[testConstraint pcOnly]} { +if {[testConstraint win]} { cd c:/ file delete -force globTest file mkdir globTest @@ -1418,70 +1418,70 @@ if {[testConstraint pcOnly]} { close [open globTest/z1.bat w] } -test filename-16.1 {windows specific globbing} {pcOnly} { +test filename-16.1 {windows specific globbing} {win} { lsort [glob globTest/*.bat] } {globTest/x1.BAT globTest/y1.Bat globTest/z1.bat} -test filename-16.2 {windows specific globbing} {pcOnly} { +test filename-16.2 {windows specific globbing} {win} { list [catch {glob c:} res] $res } {0 c:} -test filename-16.2.1 {windows specific globbing} {pcOnly} { +test filename-16.2.1 {windows specific globbing} {win} { set dir [pwd] cd C:/ set res [list [catch {glob c:} err] $err] cd $dir set res } {0 c:} -test filename-16.3 {windows specific globbing} {pcOnly} { +test filename-16.3 {windows specific globbing} {win} { glob -nocomplain c:\\\\ } c:/ -test filename-16.4 {windows specific globbing} {pcOnly} { +test filename-16.4 {windows specific globbing} {win} { glob -nocomplain c:/ } c:/ -test filename-16.5 {windows specific globbing} {pcOnly} { +test filename-16.5 {windows specific globbing} {win} { glob -nocomplain c:*bTest } c:globTest -test filename-16.6 {windows specific globbing} {pcOnly} { +test filename-16.6 {windows specific globbing} {win} { glob -nocomplain c:\\\\*bTest } c:/globTest -test filename-16.7 {windows specific globbing} {pcOnly} { +test filename-16.7 {windows specific globbing} {win} { glob -nocomplain c:/*bTest } c:/globTest -test filename-16.8 {windows specific globbing} {pcOnly} { +test filename-16.8 {windows specific globbing} {win} { lsort [glob -nocomplain c:globTest/*.bat] } {c:globTest/x1.BAT c:globTest/y1.Bat c:globTest/z1.bat} -test filename-16.9 {windows specific globbing} {pcOnly} { +test filename-16.9 {windows specific globbing} {win} { lsort [glob -nocomplain c:/globTest/*.bat] } {c:/globTest/x1.BAT c:/globTest/y1.Bat c:/globTest/z1.bat} -test filename-16.10 {windows specific globbing} {pcOnly} { +test filename-16.10 {windows specific globbing} {win} { lsort [glob -nocomplain c:globTest\\\\*.bat] } {c:globTest/x1.BAT c:globTest/y1.Bat c:globTest/z1.bat} -test filename-16.11 {windows specific globbing} {pcOnly} { +test filename-16.11 {windows specific globbing} {win} { lsort [glob -nocomplain c:\\\\globTest\\\\*.bat] } {c:/globTest/x1.BAT c:/globTest/y1.Bat c:/globTest/z1.bat} # some tests require a shared C drive -if {[testConstraint pcOnly]} { +if {[testConstraint win]} { testConstraint sharedCdrive [expr {![catch {cd //[info hostname]/c}]}] } -test filename-16.12 {windows specific globbing} {pcOnly sharedCdrive} { +test filename-16.12 {windows specific globbing} {win sharedCdrive} { cd //[info hostname]/c glob //[info hostname]/c/*Test } //[info hostname]/c/globTest -test filename-16.13 {windows specific globbing} {pcOnly sharedCdrive} { +test filename-16.13 {windows specific globbing} {win sharedCdrive} { cd //[info hostname]/c glob "\\\\\\\\[info hostname]\\\\c\\\\*Test" } //[info hostname]/c/globTest -test filename-16.14 {windows specific globbing} {pcOnly} { +test filename-16.14 {windows specific globbing} {win} { cd [lindex [glob -types d -dir C:/ *] 0] expr {[lsearch -exact [glob {{.,*}*}] ".."] != -1} } {1} -test filename-16.15 {windows specific globbing} {pcOnly} { +test filename-16.15 {windows specific globbing} {win} { cd [lindex [glob -types d -dir C:/ *] 0] glob .. } {..} -test filename-16.16 {windows specific globbing} {pcOnly} { +test filename-16.16 {windows specific globbing} {win} { file tail [lindex [glob -nocomplain "[lindex [glob -types d -dir C:/ *] 0]/.."] 0] } {..} @@ -1495,7 +1495,7 @@ if {[testConstraint testsetplatform]} { testsetplatform $platform } -test filename-17.2 {windows specific glob with executable} {winOnly} { +test filename-17.2 {windows specific glob with executable} {win} { makeDirectory execglob makeFile contents execglob/abc.exe makeFile contents execglob/abc.notexecutable diff --git a/tests/fileSystem.test b/tests/fileSystem.test index a45751f..6ae080d 100644 --- a/tests/fileSystem.test +++ b/tests/fileSystem.test @@ -107,7 +107,7 @@ test filesystem-1.1 {link normalisation} {hasLinks} { string equal [file normalize dir.dir] [file normalize dir.link] } {0} -test filesystem-1.2 {link normalisation} {hasLinks unixOnly} { +test filesystem-1.2 {link normalisation} {hasLinks unix} { testPathEqual [file normalize [file join gorp.file foo]] \ [file normalize [file join link.file foo]] } {1} @@ -132,7 +132,7 @@ test filesystem-1.6 {link normalisation} {hasLinks} { [file normalize [file join dir.link inside.file]] } {0} -test filesystem-1.7 {link normalisation} {hasLinks unixOnly} { +test filesystem-1.7 {link normalisation} {hasLinks unix} { testPathEqual [file normalize [file join dir.link linkinside.file foo]] \ [file normalize [file join dir.dir inside.file foo]] } {1} @@ -142,14 +142,14 @@ test filesystem-1.8 {link normalisation} {hasLinks} { [file normalize [file join dir.link inside.filefoo]] } {0} -test filesystem-1.9 {link normalisation} {unixOnly hasLinks} { +test filesystem-1.9 {link normalisation} {unix hasLinks} { file delete -force dir.link file link dir.link [file nativename dir.dir] testPathEqual [file normalize [file join dir.dir linkinside.file foo]] \ [file normalize [file join dir.link inside.file foo]] } {1} -test filesystem-1.10 {link normalisation: double link} {unixOnly hasLinks} { +test filesystem-1.10 {link normalisation: double link} {unix hasLinks} { file link dir2.link dir.link testPathEqual [file normalize [file join dir.dir linkinside.file foo]] \ [file normalize [file join dir2.link inside.file foo]] @@ -157,7 +157,7 @@ test filesystem-1.10 {link normalisation: double link} {unixOnly hasLinks} { makeDirectory dir2.file -test filesystem-1.11 {link normalisation: double link, back in tree} {unixOnly hasLinks} { +test filesystem-1.11 {link normalisation: double link, back in tree} {unix hasLinks} { file link [file join dir2.file dir2.link] [file join .. dir2.link] testPathEqual [file normalize [file join dir.dir linkinside.file foo]] \ [file normalize [file join dir2.file dir2.link inside.file foo]] @@ -173,65 +173,65 @@ test filesystem-1.12 {file new native path} {} { expr 1 } {1} -test filesystem-1.13 {file normalisation} {winOnly} { +test filesystem-1.13 {file normalisation} {win} { # This used to be broken file normalize C:/thislongnamedoesntexist } {C:/thislongnamedoesntexist} -test filesystem-1.14 {file normalisation} {winOnly} { +test filesystem-1.14 {file normalisation} {win} { # This used to be broken file normalize c:/ } {C:/} -test filesystem-1.15 {file normalisation} {winOnly} { +test filesystem-1.15 {file normalisation} {win} { file normalize c:/../ } {C:/} -test filesystem-1.16 {file normalisation} {winOnly} { +test filesystem-1.16 {file normalisation} {win} { file normalize c:/. } {C:/} -test filesystem-1.17 {file normalisation} {winOnly} { +test filesystem-1.17 {file normalisation} {win} { file normalize c:/.. } {C:/} -test filesystem-1.17.1 {file normalisation} {winOnly} { +test filesystem-1.17.1 {file normalisation} {win} { file normalize c:\\.. } {C:/} -test filesystem-1.18 {file normalisation} {winOnly} { +test filesystem-1.18 {file normalisation} {win} { file normalize c:/./ } {C:/} -test filesystem-1.19 {file normalisation} {winOnly unusedDrive} { +test filesystem-1.19 {file normalisation} {win unusedDrive} { file normalize ${drive}:/./../../.. } "${drive}:/" -test filesystem-1.20 {file normalisation} {winOnly} { +test filesystem-1.20 {file normalisation} {win} { file normalize //name/foo/../ } {//name/foo} -test filesystem-1.21 {file normalisation} {winOnly} { +test filesystem-1.21 {file normalisation} {win} { file normalize C:///foo/./ } {C:/foo} -test filesystem-1.22 {file normalisation} {winOnly} { +test filesystem-1.22 {file normalisation} {win} { file normalize //name/foo/. } {//name/foo} -test filesystem-1.23 {file normalisation} {winOnly} { +test filesystem-1.23 {file normalisation} {win} { file normalize c:/./foo } {C:/foo} -test filesystem-1.24 {file normalisation} {winOnly unusedDrive} { +test filesystem-1.24 {file normalisation} {win unusedDrive} { file normalize ${drive}:/./../../../a } "${drive}:/a" -test filesystem-1.25 {file normalisation} {winOnly unusedDrive} { +test filesystem-1.25 {file normalisation} {win unusedDrive} { file normalize ${drive}:/./.././../../a } "${drive}:/a" -test filesystem-1.25.1 {file normalisation} {winOnly unusedDrive} { +test filesystem-1.25.1 {file normalisation} {win unusedDrive} { file normalize ${drive}:/./.././..\\..\\a\\bb } "${drive}:/a/bb" @@ -377,7 +377,7 @@ test filesystem-1.37 {file normalisation with '/./'} { } {ok} test filesystem-1.38 {file normalisation with volume relative} \ - {winOnly moreThanOneDrive} { + {win moreThanOneDrive} { set path "[string range [lindex $drives 0] 0 1]foo" set dir [pwd] cd [lindex $drives 1] @@ -386,7 +386,7 @@ test filesystem-1.38 {file normalisation with volume relative} \ set res } "[lindex $drives 0]foo" -test filesystem-1.39 {file normalisation with volume relative} {winOnly} { +test filesystem-1.39 {file normalisation with volume relative} {win} { set drv C:/ set dir [lindex [glob -type d -dir $drv *] 0] set old [pwd] @@ -411,7 +411,7 @@ test filesystem-1.40 {file normalisation with repeated separators} { } } {ok} -test filesystem-1.41 {file normalisation with repeated separators} {winOnly} { +test filesystem-1.41 {file normalisation with repeated separators} {win} { set a [file norm foo\\\\\\bar] set b [file norm foo/bar] @@ -422,7 +422,7 @@ test filesystem-1.41 {file normalisation with repeated separators} {winOnly} { } } {ok} -test filesystem-2.0 {new native path} {unixOnly} { +test filesystem-2.0 {new native path} {unix} { foreach f [lsort [glob -nocomplain /usr/bin/c*]] { catch {file readlink $f} } @@ -805,7 +805,7 @@ test filesystem-7.4 {cross-filesystem file copy with -force} \ } {0 10 1 {error copying "simplefs:/simplefile" to "file2": file already exists} 0 10 1} test filesystem-7.5 {cross-filesystem file copy with -force} \ - {testsimplefilesystem unixOnly} { + {testsimplefilesystem unix} { set dir [pwd] cd [tcltest::temporaryDirectory] set fout [open [file join simplefile] w] @@ -860,7 +860,7 @@ test filesystem-7.6 {cross-filesystem dir copy with -force} \ } {0 {} 1 {error copying "simplefs:/simpledir" to "dir2/simpledir": file already exists} 0 {} 1 1} test filesystem-7.7 {cross-filesystem dir copy with -force} \ - {testsimplefilesystem unixOnly} { + {testsimplefilesystem unix} { set dir [pwd] cd [tcltest::temporaryDirectory] file delete -force simpledir diff --git a/tests/io.test b/tests/io.test index 0f2736d..80aafa2 100644 --- a/tests/io.test +++ b/tests/io.test @@ -12,7 +12,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: io.test,v 1.55 2004/06/01 18:36:26 davygrvy Exp $ +# RCS: @(#) $Id: io.test,v 1.56 2004/06/23 15:36:56 dkf Exp $ if {[catch {package require tcltest 2}]} { puts stderr "Skipping tests in [info script]. tcltest 2 required." @@ -1606,7 +1606,7 @@ out } {err }} # This test relies on the fact that the smallest available fd is used first. -test io-14.4 {Tcl_SetStdChannel & Tcl_GetStdChannel} {exec unixOnly} { +test io-14.4 {Tcl_SetStdChannel & Tcl_GetStdChannel} {exec unix} { set f [open $path(test1) w] puts -nonewline $f { close stdin close stdout @@ -1855,13 +1855,13 @@ test io-20.1 {Tcl_CreateChannel: initial settings} { close $a set x } {ascii} -test io-20.2 {Tcl_CreateChannel: initial settings} {pcOnly} { +test io-20.2 {Tcl_CreateChannel: initial settings} {win} { set f [open $path(test1) w+] set x [list [fconfigure $f -eofchar] [fconfigure $f -translation]] close $f set x } [list [list \x1a ""] {auto crlf}] -test io-20.3 {Tcl_CreateChannel: initial settings} {unixOnly} { +test io-20.3 {Tcl_CreateChannel: initial settings} {unix} { set f [open $path(test1) w+] set x [list [fconfigure $f -eofchar] [fconfigure $f -translation]] close $f @@ -2149,7 +2149,7 @@ test io-28.4 {Tcl_Close} {testchannel} { $consoleFileNames] string compare $l $x } 0 -test io-28.5 {Tcl_Close vs standard handles} {stdio unixOnly testchannel openpipe} { +test io-28.5 {Tcl_Close vs standard handles} {stdio unix testchannel openpipe} { file delete $path(script) set f [open $path(script) w] puts $f { @@ -2978,7 +2978,7 @@ there and here } -test io-30.17 {Tcl_Write, implicit ^Z at end, Tcl_Read auto} {pcOnly} { +test io-30.17 {Tcl_Write, implicit ^Z at end, Tcl_Read auto} {win} { file delete $path(test1) set f [open $path(test1) w] fconfigure $f -eofchar \x1a -translation lf @@ -5093,7 +5093,7 @@ test io-39.21 {Tcl_SetChannelOption, setting read mode independently} \ set modes } {auto crlf} -test io-39.22 {Tcl_SetChannelOption, invariance} {unixOnly} { +test io-39.22 {Tcl_SetChannelOption, invariance} {unix} { file delete $path(test1) set f1 [open $path(test1) w+] set l "" @@ -5153,7 +5153,7 @@ test io-40.1 {POSIX open access modes: RDWR} { close $f set x } {zzy abzzy} -test io-40.2 {POSIX open access modes: CREAT} {unixOnly} { +test io-40.2 {POSIX open access modes: CREAT} {unix} { file delete $path(test3) set f [open $path(test3) {WRONLY CREAT} 0600] file stat $path(test3) stats @@ -5170,7 +5170,7 @@ test io-40.2 {POSIX open access modes: CREAT} {unixOnly} { # if "umask" cannot be run, the tests will be skipped. catch {testConstraint umask2 [expr {[exec umask] == 2}]} -test io-40.3 {POSIX open access modes: CREAT} {unixOnly umask2} { +test io-40.3 {POSIX open access modes: CREAT} {unix umask2} { # This test only works if your umask is 2, like ouster's. file delete $path(test3) set f [open $path(test3) {WRONLY CREAT}] @@ -5242,7 +5242,7 @@ test io-40.8 {POSIX open access modes: TRUNC} { close $f set x } abc -test io-40.9 {POSIX open access modes: NONBLOCK} {nonPortable unixOnly} { +test io-40.9 {POSIX open access modes: NONBLOCK} {nonPortable unix} { file delete $path(test3) set f [open $path(test3) {WRONLY NONBLOCK CREAT}] puts $f "NONBLOCK test" @@ -5717,7 +5717,7 @@ test io-48.2 {testing readability conditions} {nonBlockFiles fileevent} { set path(my_script) [makeFile {} my_script] -test io-48.3 {testing readability conditions} {stdio unixOnly nonBlockFiles openpipe fileevent} { +test io-48.3 {testing readability conditions} {stdio unix nonBlockFiles openpipe fileevent} { set f [open $path(bar) w] puts $f abcdefg puts $f abcdefg @@ -6653,7 +6653,7 @@ test io-53.2 {CopyData} {fcopy} { } set result } {0 0 ok} -test io-53.3 {CopyData: background read underflow} {stdio unixOnly openpipe fcopy} { +test io-53.3 {CopyData: background read underflow} {stdio unix openpipe fcopy} { file delete $path(test1) file delete $path(pipe) set f1 [open $path(pipe) w] @@ -6685,7 +6685,7 @@ test io-53.3 {CopyData: background read underflow} {stdio unixOnly openpipe fcop close $f set result } "ready line1 line2 {done\n}" -test io-53.4 {CopyData: background write overflow} {stdio unixOnly openpipe fileevent fcopy} { +test io-53.4 {CopyData: background write overflow} {stdio unix openpipe fileevent fcopy} { set big bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb\n variable x for {set x 0} {$x < 12} {incr x} { diff --git a/tests/ioCmd.test b/tests/ioCmd.test index 880de35..45f889d 100644 --- a/tests/ioCmd.test +++ b/tests/ioCmd.test @@ -12,7 +12,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: ioCmd.test,v 1.20 2004/03/17 18:14:18 das Exp $ +# RCS: @(#) $Id: ioCmd.test,v 1.21 2004/06/23 15:36:57 dkf Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest @@ -311,14 +311,14 @@ test iocmd-8.17 {fconfigure command / tcp channel} {nonPortable} { regsub -all {can([^:])+: } $r {} r; set r } 1 -test iocmd-8.18 {fconfigure command / unix tty channel} {nonPortable unixOnly} { +test iocmd-8.18 {fconfigure command / unix tty channel} {nonPortable unix} { # might fail if /dev/ttya is unavailable set tty [open /dev/ttya] set r [list [catch {fconfigure $tty -blah blih} msg] $msg]; close $tty; set r; } {1 {bad option "-blah": should be one of -blocking, -buffering, -buffersize, -encoding, -eofchar, -translation, or -mode}} -test iocmd-8.19 {fconfigure command / win tty channel} {nonPortable pcOnly} { +test iocmd-8.19 {fconfigure command / win tty channel} {nonPortable win} { # might fail if com1 is unavailable set tty [open com1] set r [list [catch {fconfigure $tty -blah blih} msg] $msg]; @@ -394,7 +394,7 @@ test iocmd-12.3 {POSIX open access modes: WRONLY} -match regexp -body { # # Test 13.4 relies on assigning the same channel name twice. # -test iocmd-12.4 {POSIX open access modes: WRONLY} {unixOnly} { +test iocmd-12.4 {POSIX open access modes: WRONLY} {unix} { file delete $path(test3) set f [open $path(test3) w] fconfigure $f -eofchar {} diff --git a/tests/iogt.test b/tests/iogt.test index bd179ea..53fd737 100644 --- a/tests/iogt.test +++ b/tests/iogt.test @@ -10,7 +10,7 @@ # Copyright (c) 2000 Andreas Kupries. # All rights reserved. # -# RCS: @(#) $Id: iogt.test,v 1.10 2004/06/01 18:36:43 davygrvy Exp $ +# RCS: @(#) $Id: iogt.test,v 1.11 2004/06/23 15:36:57 dkf Exp $ if {[catch {package require tcltest 2.1}]} { puts stderr "Skipping tests in [info script]. tcltest 2.1 required." @@ -489,7 +489,7 @@ test iogt-2.0 {basic I/O going through transform} testchannel { } {1 71 71} -test iogt-2.1 {basic I/O, operation trail} {testchannel unixOnly} { +test iogt-2.1 {basic I/O, operation trail} {testchannel unix} { set fin [open $path(dummy) r] set fout [open $path(dummyout) w] @@ -539,7 +539,7 @@ write flush/write delete/write} -test iogt-2.2 {basic I/O, data trail} {testchannel unixOnly} { +test iogt-2.2 {basic I/O, data trail} {testchannel unix} { set fin [open $path(dummy) r] set fout [open $path(dummyout) w] @@ -594,7 +594,7 @@ flush/write {} {} delete/write {} *ignored*} -test iogt-2.3 {basic I/O, mixed trail} {testchannel unixOnly} { +test iogt-2.3 {basic I/O, mixed trail} {testchannel unix} { set fin [open $path(dummy) r] set fout [open $path(dummyout) w] diff --git a/tests/parseExpr.test b/tests/parseExpr.test index e65c646..b60cee3 100644 --- a/tests/parseExpr.test +++ b/tests/parseExpr.test @@ -8,7 +8,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: parseExpr.test,v 1.12 2004/05/19 20:15:32 dkf Exp $ +# RCS: @(#) $Id: parseExpr.test,v 1.13 2004/06/23 15:36:57 dkf Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest 2 @@ -519,10 +519,10 @@ test parseExpr-16.7 {GetLexeme procedure, double lexeme} testexprparser { test parseExpr-16.8 {GetLexeme procedure, double lexeme} testexprparser { testexprparser {.123} -1 } {- {} 0 subexpr .123 1 text .123 0 {}} -test parseExpr-16.9 {GetLexeme procedure, double lexeme} {testexprparser nonPortable unixOnly} { +test parseExpr-16.9 {GetLexeme procedure, double lexeme} {testexprparser nonPortable unix} { testexprparser {nan} -1 } {- {} 0 subexpr nan 1 text nan 0 {}} -test parseExpr-16.10 {GetLexeme procedure, double lexeme} {testexprparser nonPortable unixOnly} { +test parseExpr-16.10 {GetLexeme procedure, double lexeme} {testexprparser nonPortable unix} { testexprparser {NaN} -1 } {- {} 0 subexpr NaN 1 text NaN 0 {}} test parseExpr-16.11 {GetLexeme procedure, bad double lexeme too big} testexprparser { diff --git a/tests/pkgMkIndex.test b/tests/pkgMkIndex.test index 958acaf..b3e5249 100644 --- a/tests/pkgMkIndex.test +++ b/tests/pkgMkIndex.test @@ -8,7 +8,7 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: pkgMkIndex.test,v 1.25 2003/11/14 20:44:46 dgp Exp $ +# RCS: @(#) $Id: pkgMkIndex.test,v 1.26 2004/06/23 15:36:57 dkf Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest 2 @@ -674,22 +674,22 @@ test pkgMkIndex-13.1 {proc names with embedded spaces} { removeFile [file join pkg spacename.tcl] # Test the pkg_compareExtension helper function -test pkgMkIndex-14.1 {pkg_compareExtension} {unixOnly} { +test pkgMkIndex-14.1 {pkg_compareExtension} {unix} { pkg_compareExtension foo.so .so } 1 -test pkgMkIndex-14.2 {pkg_compareExtension} {unixOnly} { +test pkgMkIndex-14.2 {pkg_compareExtension} {unix} { pkg_compareExtension foo.so.bar .so } 0 -test pkgMkIndex-14.3 {pkg_compareExtension} {unixOnly} { +test pkgMkIndex-14.3 {pkg_compareExtension} {unix} { pkg_compareExtension foo.so.1 .so } 1 -test pkgMkIndex-14.4 {pkg_compareExtension} {unixOnly} { +test pkgMkIndex-14.4 {pkg_compareExtension} {unix} { pkg_compareExtension foo.so.1.2 .so } 1 -test pkgMkIndex-14.5 {pkg_compareExtension} {unixOnly} { +test pkgMkIndex-14.5 {pkg_compareExtension} {unix} { pkg_compareExtension foo .so } 0 -test pkgMkIndex-14.6 {pkg_compareExtension} {unixOnly} { +test pkgMkIndex-14.6 {pkg_compareExtension} {unix} { pkg_compareExtension foo.so.1.2.bar .so } 0 diff --git a/tests/registry.test b/tests/registry.test index cace66f..0621b69 100644 --- a/tests/registry.test +++ b/tests/registry.test @@ -10,7 +10,7 @@ # Copyright (c) 1997 by Sun Microsystems, Inc. All rights reserved. # Copyright (c) 1998-1999 by Scriptics Corporation. # -# RCS: @(#) $Id: registry.test,v 1.16 2004/03/05 15:48:03 kennykb Exp $ +# RCS: @(#) $Id: registry.test,v 1.17 2004/06/23 15:36:58 dkf Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest 2 @@ -35,119 +35,119 @@ testConstraint english [expr {[llength [info commands testlocale]] set hostname [info hostname] -test registry-1.1 {argument parsing for registry command} {pcOnly} { +test registry-1.1 {argument parsing for registry command} {win} { list [catch {registry} msg] $msg } {1 {wrong # args: should be "registry option ?arg arg ...?"}} -test registry-1.2 {argument parsing for registry command} {pcOnly} { +test registry-1.2 {argument parsing for registry command} {win} { list [catch {registry foo} msg] $msg } {1 {bad option "foo": must be broadcast, delete, get, keys, set, type, or values}} -test registry-1.3 {argument parsing for registry command} {pcOnly} { +test registry-1.3 {argument parsing for registry command} {win} { list [catch {registry d} msg] $msg } {1 {wrong # args: should be "registry delete keyName ?valueName?"}} -test registry-1.4 {argument parsing for registry command} {pcOnly} { +test registry-1.4 {argument parsing for registry command} {win} { list [catch {registry delete} msg] $msg } {1 {wrong # args: should be "registry delete keyName ?valueName?"}} -test registry-1.5 {argument parsing for registry command} {pcOnly} { +test registry-1.5 {argument parsing for registry command} {win} { list [catch {registry delete foo bar baz} msg] $msg } {1 {wrong # args: should be "registry delete keyName ?valueName?"}} -test registry-1.6 {argument parsing for registry command} {pcOnly} { +test registry-1.6 {argument parsing for registry command} {win} { list [catch {registry g} msg] $msg } {1 {wrong # args: should be "registry get keyName valueName"}} -test registry-1.7 {argument parsing for registry command} {pcOnly} { +test registry-1.7 {argument parsing for registry command} {win} { list [catch {registry get} msg] $msg } {1 {wrong # args: should be "registry get keyName valueName"}} -test registry-1.8 {argument parsing for registry command} {pcOnly} { +test registry-1.8 {argument parsing for registry command} {win} { list [catch {registry get foo} msg] $msg } {1 {wrong # args: should be "registry get keyName valueName"}} -test registry-1.9 {argument parsing for registry command} {pcOnly} { +test registry-1.9 {argument parsing for registry command} {win} { list [catch {registry get foo bar baz} msg] $msg } {1 {wrong # args: should be "registry get keyName valueName"}} -test registry-1.10 {argument parsing for registry command} {pcOnly} { +test registry-1.10 {argument parsing for registry command} {win} { list [catch {registry k} msg] $msg } {1 {wrong # args: should be "registry keys keyName ?pattern?"}} -test registry-1.11 {argument parsing for registry command} {pcOnly} { +test registry-1.11 {argument parsing for registry command} {win} { list [catch {registry keys} msg] $msg } {1 {wrong # args: should be "registry keys keyName ?pattern?"}} -test registry-1.12 {argument parsing for registry command} {pcOnly} { +test registry-1.12 {argument parsing for registry command} {win} { list [catch {registry keys foo bar baz} msg] $msg } {1 {wrong # args: should be "registry keys keyName ?pattern?"}} -test registry-1.13 {argument parsing for registry command} {pcOnly} { +test registry-1.13 {argument parsing for registry command} {win} { list [catch {registry s} msg] $msg } {1 {wrong # args: should be "registry set keyName ?valueName data ?type??"}} -test registry-1.14 {argument parsing for registry command} {pcOnly} { +test registry-1.14 {argument parsing for registry command} {win} { list [catch {registry set} msg] $msg } {1 {wrong # args: should be "registry set keyName ?valueName data ?type??"}} -test registry-1.15 {argument parsing for registry command} {pcOnly} { +test registry-1.15 {argument parsing for registry command} {win} { list [catch {registry set foo bar} msg] $msg } {1 {wrong # args: should be "registry set keyName ?valueName data ?type??"}} -test registry-1.16 {argument parsing for registry command} {pcOnly} { +test registry-1.16 {argument parsing for registry command} {win} { list [catch {registry set foo bar baz blat gorp} msg] $msg } {1 {wrong # args: should be "registry set keyName ?valueName data ?type??"}} -test registry-1.17 {argument parsing for registry command} {pcOnly} { +test registry-1.17 {argument parsing for registry command} {win} { list [catch {registry t} msg] $msg } {1 {wrong # args: should be "registry type keyName valueName"}} -test registry-1.18 {argument parsing for registry command} {pcOnly} { +test registry-1.18 {argument parsing for registry command} {win} { list [catch {registry type} msg] $msg } {1 {wrong # args: should be "registry type keyName valueName"}} -test registry-1.19 {argument parsing for registry command} {pcOnly} { +test registry-1.19 {argument parsing for registry command} {win} { list [catch {registry type foo} msg] $msg } {1 {wrong # args: should be "registry type keyName valueName"}} -test registry-1.20 {argument parsing for registry command} {pcOnly} { +test registry-1.20 {argument parsing for registry command} {win} { list [catch {registry type foo bar baz} msg] $msg } {1 {wrong # args: should be "registry type keyName valueName"}} -test registry-1.21 {argument parsing for registry command} {pcOnly} { +test registry-1.21 {argument parsing for registry command} {win} { list [catch {registry v} msg] $msg } {1 {wrong # args: should be "registry values keyName ?pattern?"}} -test registry-1.22 {argument parsing for registry command} {pcOnly} { +test registry-1.22 {argument parsing for registry command} {win} { list [catch {registry values} msg] $msg } {1 {wrong # args: should be "registry values keyName ?pattern?"}} -test registry-1.23 {argument parsing for registry command} {pcOnly} { +test registry-1.23 {argument parsing for registry command} {win} { list [catch {registry values foo bar baz} msg] $msg } {1 {wrong # args: should be "registry values keyName ?pattern?"}} -test registry-2.1 {DeleteKey: bad key} {pcOnly} { +test registry-2.1 {DeleteKey: bad key} {win} { list [catch {registry delete foo} msg] $msg } {1 {bad root name "foo": must be HKEY_LOCAL_MACHINE, HKEY_USERS, HKEY_CLASSES_ROOT, HKEY_CURRENT_USER, HKEY_CURRENT_CONFIG, HKEY_PERFORMANCE_DATA, or HKEY_DYN_DATA}} -test registry-2.2 {DeleteKey: bad key} {pcOnly} { +test registry-2.2 {DeleteKey: bad key} {win} { list [catch {registry delete HKEY_CLASSES_ROOT} msg] $msg } {1 {bad key: cannot delete root keys}} -test registry-2.3 {DeleteKey: bad key} {pcOnly} { +test registry-2.3 {DeleteKey: bad key} {win} { list [catch {registry delete HKEY_CLASSES_ROOT\\} msg] $msg } {1 {bad key: cannot delete root keys}} -test registry-2.4 {DeleteKey: subkey at root level} {pcOnly} { +test registry-2.4 {DeleteKey: subkey at root level} {win} { registry set HKEY_CLASSES_ROOT\\TclFoobar registry delete HKEY_CLASSES_ROOT\\TclFoobar registry keys HKEY_CLASSES_ROOT TclFoobar } {} -test registry-2.5 {DeleteKey: subkey below root level} {pcOnly} { +test registry-2.5 {DeleteKey: subkey below root level} {win} { registry set HKEY_CLASSES_ROOT\\TclFoobar\\test registry delete HKEY_CLASSES_ROOT\\TclFoobar\\test set result [registry keys HKEY_CLASSES_ROOT TclFoobar\\test] registry delete HKEY_CLASSES_ROOT\\TclFoobar set result } {} -test registry-2.6 {DeleteKey: recursive delete} {pcOnly} { +test registry-2.6 {DeleteKey: recursive delete} {win} { registry set HKEY_CLASSES_ROOT\\TclFoobar\\test1 registry set HKEY_CLASSES_ROOT\\TclFoobar\\test2\\test3 registry delete HKEY_CLASSES_ROOT\\TclFoobar set result [registry keys HKEY_CLASSES_ROOT TclFoobar] set result } {} -test registry-2.7 {DeleteKey: trailing backslashes} {pcOnly english} { +test registry-2.7 {DeleteKey: trailing backslashes} {win english} { registry set HKEY_CLASSES_ROOT\\TclFoobar\\baz list [catch {registry delete HKEY_CLASSES_ROOT\\TclFoobar\\} msg] $msg } {1 {unable to delete key: The configuration registry key is invalid.}} -test registry-2.8 {DeleteKey: failure} {pcOnly} { +test registry-2.8 {DeleteKey: failure} {win} { registry delete HKEY_CLASSES_ROOT\\TclFoobar registry delete HKEY_CLASSES_ROOT\\TclFoobar } {} -test registry-2.9 {DeleteKey: unicode} {pcOnly} { +test registry-2.9 {DeleteKey: unicode} {win} { registry delete HKEY_CLASSES_ROOT\\TclFoobar registry set HKEY_CLASSES_ROOT\\TclFoobar\\test\u00c7bar\\a registry set HKEY_CLASSES_ROOT\\TclFoobar\\test\u00c7bar\\b @@ -157,7 +157,7 @@ test registry-2.9 {DeleteKey: unicode} {pcOnly} { set result } {} -test registry-3.1 {DeleteValue} {pcOnly} { +test registry-3.1 {DeleteValue} {win} { registry delete HKEY_CLASSES_ROOT\\TclFoobar registry set HKEY_CLASSES_ROOT\\TclFoobar\\baz test1 blort registry set HKEY_CLASSES_ROOT\\TclFoobar\\baz test2 blat @@ -166,18 +166,18 @@ test registry-3.1 {DeleteValue} {pcOnly} { registry delete HKEY_CLASSES_ROOT\\TclFoobar set result } test2 -test registry-3.2 {DeleteValue: bad key} {pcOnly english} { +test registry-3.2 {DeleteValue: bad key} {win english} { registry delete HKEY_CLASSES_ROOT\\TclFoobar list [catch {registry delete HKEY_CLASSES_ROOT\\TclFoobar test} msg] $msg } {1 {unable to open key: The system cannot find the file specified.}} -test registry-3.3 {DeleteValue: bad value} {pcOnly english} { +test registry-3.3 {DeleteValue: bad value} {win english} { registry delete HKEY_CLASSES_ROOT\\TclFoobar registry set HKEY_CLASSES_ROOT\\TclFoobar\\baz test2 blort set result [list [catch {registry delete HKEY_CLASSES_ROOT\\TclFoobar test1} msg] $msg] registry delete HKEY_CLASSES_ROOT\\TclFoobar set result } {1 {unable to delete value "test1" from key "HKEY_CLASSES_ROOT\TclFoobar": The system cannot find the file specified.}} -test registry-3.4 {DeleteValue: Unicode} {pcOnly} { +test registry-3.4 {DeleteValue: Unicode} {win} { registry delete HKEY_CLASSES_ROOT\\TclFoobar registry set HKEY_CLASSES_ROOT\\TclFoobar\\\u00c7baz \u00c7test1 blort registry set HKEY_CLASSES_ROOT\\TclFoobar\\\u00c7baz test2 blat @@ -187,31 +187,31 @@ test registry-3.4 {DeleteValue: Unicode} {pcOnly} { set result } test2 -test registry-4.1 {GetKeyNames: bad key} {pcOnly english} { +test registry-4.1 {GetKeyNames: bad key} {win english} { registry delete HKEY_CLASSES_ROOT\\TclFoobar list [catch {registry keys HKEY_CLASSES_ROOT\\TclFoobar} msg] $msg } {1 {unable to open key: The system cannot find the file specified.}} -test registry-4.2 {GetKeyNames} {pcOnly} { +test registry-4.2 {GetKeyNames} {win} { registry delete HKEY_CLASSES_ROOT\\TclFoobar registry set HKEY_CLASSES_ROOT\\TclFoobar\\baz set result [registry keys HKEY_CLASSES_ROOT\\TclFoobar] registry delete HKEY_CLASSES_ROOT\\TclFoobar set result } {baz} -test registry-4.3 {GetKeyNames: remote key} {pcOnly nonPortable english} { +test registry-4.3 {GetKeyNames: remote key} {win nonPortable english} { registry set \\\\$hostname\\HKEY_CLASSES_ROOT\\TclFoobar\\baz set result [registry keys \\\\gaspode\\HKEY_CLASSES_ROOT\\TclFoobar] registry delete \\\\$hostname\\HKEY_CLASSES_ROOT\\TclFoobar set result } {baz} -test registry-4.4 {GetKeyNames: empty key} {pcOnly} { +test registry-4.4 {GetKeyNames: empty key} {win} { registry delete HKEY_CLASSES_ROOT\\TclFoobar registry set HKEY_CLASSES_ROOT\\TclFoobar set result [registry keys HKEY_CLASSES_ROOT\\TclFoobar] registry delete HKEY_CLASSES_ROOT\\TclFoobar set result } {} -test registry-4.5 {GetKeyNames: patterns} {pcOnly} { +test registry-4.5 {GetKeyNames: patterns} {win} { registry delete HKEY_CLASSES_ROOT\\TclFoobar registry set HKEY_CLASSES_ROOT\\TclFoobar\\baz registry set HKEY_CLASSES_ROOT\\TclFoobar\\blat @@ -220,7 +220,7 @@ test registry-4.5 {GetKeyNames: patterns} {pcOnly} { registry delete HKEY_CLASSES_ROOT\\TclFoobar set result } {baz blat} -test registry-4.6 {GetKeyNames: names with spaces} {pcOnly} { +test registry-4.6 {GetKeyNames: names with spaces} {win} { registry delete HKEY_CLASSES_ROOT\\TclFoobar registry set HKEY_CLASSES_ROOT\\TclFoobar\\baz\ bar registry set HKEY_CLASSES_ROOT\\TclFoobar\\blat @@ -229,7 +229,7 @@ test registry-4.6 {GetKeyNames: names with spaces} {pcOnly} { registry delete HKEY_CLASSES_ROOT\\TclFoobar set result } {{baz bar} blat} -test registry-4.7 {GetKeyNames: Unicode} {pcOnly english} { +test registry-4.7 {GetKeyNames: Unicode} {win english} { registry delete HKEY_CLASSES_ROOT\\TclFoobar registry set HKEY_CLASSES_ROOT\\TclFoobar\\baz\u00c7bar registry set HKEY_CLASSES_ROOT\\TclFoobar\\blat @@ -238,7 +238,7 @@ test registry-4.7 {GetKeyNames: Unicode} {pcOnly english} { registry delete HKEY_CLASSES_ROOT\\TclFoobar set result } "baz\u00c7bar blat" -test registry-4.8 {GetKeyNames: Unicode} {pcOnly nt} { +test registry-4.8 {GetKeyNames: Unicode} {win nt} { registry delete HKEY_CLASSES_ROOT\\TclFoobar registry set HKEY_CLASSES_ROOT\\TclFoobar\\baz\u30b7bar registry set HKEY_CLASSES_ROOT\\TclFoobar\\blat @@ -248,217 +248,217 @@ test registry-4.8 {GetKeyNames: Unicode} {pcOnly nt} { set result } "baz\u30b7bar blat" -test registry-5.1 {GetType} {pcOnly english} { +test registry-5.1 {GetType} {win english} { registry delete HKEY_CLASSES_ROOT\\TclFoobar list [catch {registry type HKEY_CLASSES_ROOT\\TclFoobar val1} msg] $msg } {1 {unable to open key: The system cannot find the file specified.}} -test registry-5.2 {GetType} {pcOnly english} { +test registry-5.2 {GetType} {win english} { registry set HKEY_CLASSES_ROOT\\TclFoobar list [catch {registry type HKEY_CLASSES_ROOT\\TclFoobar val1} msg] $msg } {1 {unable to get type of value "val1" from key "HKEY_CLASSES_ROOT\TclFoobar": The system cannot find the file specified.}} -test registry-5.3 {GetType} {pcOnly} { +test registry-5.3 {GetType} {win} { registry set HKEY_CLASSES_ROOT\\TclFoobar val1 foobar none set result [registry type HKEY_CLASSES_ROOT\\TclFoobar val1] registry delete HKEY_CLASSES_ROOT\\TclFoobar set result } none -test registry-5.4 {GetType} {pcOnly} { +test registry-5.4 {GetType} {win} { registry set HKEY_CLASSES_ROOT\\TclFoobar val1 foobar set result [registry type HKEY_CLASSES_ROOT\\TclFoobar val1] registry delete HKEY_CLASSES_ROOT\\TclFoobar set result } sz -test registry-5.5 {GetType} {pcOnly} { +test registry-5.5 {GetType} {win} { registry set HKEY_CLASSES_ROOT\\TclFoobar val1 foobar sz set result [registry type HKEY_CLASSES_ROOT\\TclFoobar val1] registry delete HKEY_CLASSES_ROOT\\TclFoobar set result } sz -test registry-5.6 {GetType} {pcOnly} { +test registry-5.6 {GetType} {win} { registry set HKEY_CLASSES_ROOT\\TclFoobar val1 foobar expand_sz set result [registry type HKEY_CLASSES_ROOT\\TclFoobar val1] registry delete HKEY_CLASSES_ROOT\\TclFoobar set result } expand_sz -test registry-5.7 {GetType} {pcOnly} { +test registry-5.7 {GetType} {win} { registry set HKEY_CLASSES_ROOT\\TclFoobar val1 1 binary set result [registry type HKEY_CLASSES_ROOT\\TclFoobar val1] registry delete HKEY_CLASSES_ROOT\\TclFoobar set result } binary -test registry-5.8 {GetType} {pcOnly} { +test registry-5.8 {GetType} {win} { registry set HKEY_CLASSES_ROOT\\TclFoobar val1 1 dword set result [registry type HKEY_CLASSES_ROOT\\TclFoobar val1] registry delete HKEY_CLASSES_ROOT\\TclFoobar set result } dword -test registry-5.9 {GetType} {pcOnly} { +test registry-5.9 {GetType} {win} { registry set HKEY_CLASSES_ROOT\\TclFoobar val1 1 dword_big_endian set result [registry type HKEY_CLASSES_ROOT\\TclFoobar val1] registry delete HKEY_CLASSES_ROOT\\TclFoobar set result } dword_big_endian -test registry-5.10 {GetType} {pcOnly} { +test registry-5.10 {GetType} {win} { registry set HKEY_CLASSES_ROOT\\TclFoobar val1 1 link set result [registry type HKEY_CLASSES_ROOT\\TclFoobar val1] registry delete HKEY_CLASSES_ROOT\\TclFoobar set result } link -test registry-5.11 {GetType} {pcOnly} { +test registry-5.11 {GetType} {win} { registry set HKEY_CLASSES_ROOT\\TclFoobar val1 foobar multi_sz set result [registry type HKEY_CLASSES_ROOT\\TclFoobar val1] registry delete HKEY_CLASSES_ROOT\\TclFoobar set result } multi_sz -test registry-5.12 {GetType} {pcOnly} { +test registry-5.12 {GetType} {win} { registry set HKEY_CLASSES_ROOT\\TclFoobar val1 1 resource_list set result [registry type HKEY_CLASSES_ROOT\\TclFoobar val1] registry delete HKEY_CLASSES_ROOT\\TclFoobar set result } resource_list -test registry-5.13 {GetType: unknown types} {pcOnly} { +test registry-5.13 {GetType: unknown types} {win} { registry set HKEY_CLASSES_ROOT\\TclFoobar val1 1 24 set result [registry type HKEY_CLASSES_ROOT\\TclFoobar val1] registry delete HKEY_CLASSES_ROOT\\TclFoobar set result } 24 -test registry-5.14 {GetType: Unicode} {pcOnly} { +test registry-5.14 {GetType: Unicode} {win} { registry set HKEY_CLASSES_ROOT\\TclFoobar va\u00c7l1 1 24 set result [registry type HKEY_CLASSES_ROOT\\TclFoobar va\u00c7l1] registry delete HKEY_CLASSES_ROOT\\TclFoobar set result } 24 -test registry-6.1 {GetValue} {pcOnly english} { +test registry-6.1 {GetValue} {win english} { registry delete HKEY_CLASSES_ROOT\\TclFoobar list [catch {registry get HKEY_CLASSES_ROOT\\TclFoobar val1} msg] $msg } {1 {unable to open key: The system cannot find the file specified.}} -test registry-6.2 {GetValue} {pcOnly english} { +test registry-6.2 {GetValue} {win english} { registry set HKEY_CLASSES_ROOT\\TclFoobar list [catch {registry get HKEY_CLASSES_ROOT\\TclFoobar val1} msg] $msg } {1 {unable to get value "val1" from key "HKEY_CLASSES_ROOT\TclFoobar": The system cannot find the file specified.}} -test registry-6.3 {GetValue} {pcOnly} { +test registry-6.3 {GetValue} {win} { registry set HKEY_CLASSES_ROOT\\TclFoobar val1 foobar none set result [registry get HKEY_CLASSES_ROOT\\TclFoobar val1] registry delete HKEY_CLASSES_ROOT\\TclFoobar set result } foobar -test registry-6.4 {GetValue} {pcOnly} { +test registry-6.4 {GetValue} {win} { registry set HKEY_CLASSES_ROOT\\TclFoobar val1 foobar set result [registry get HKEY_CLASSES_ROOT\\TclFoobar val1] registry delete HKEY_CLASSES_ROOT\\TclFoobar set result } foobar -test registry-6.5 {GetValue} {pcOnly} { +test registry-6.5 {GetValue} {win} { registry set HKEY_CLASSES_ROOT\\TclFoobar val1 foobar sz set result [registry get HKEY_CLASSES_ROOT\\TclFoobar val1] registry delete HKEY_CLASSES_ROOT\\TclFoobar set result } foobar -test registry-6.6 {GetValue} {pcOnly} { +test registry-6.6 {GetValue} {win} { registry set HKEY_CLASSES_ROOT\\TclFoobar val1 foobar expand_sz set result [registry get HKEY_CLASSES_ROOT\\TclFoobar val1] registry delete HKEY_CLASSES_ROOT\\TclFoobar set result } foobar -test registry-6.7 {GetValue} {pcOnly} { +test registry-6.7 {GetValue} {win} { registry set HKEY_CLASSES_ROOT\\TclFoobar val1 1 binary set result [registry get HKEY_CLASSES_ROOT\\TclFoobar val1] registry delete HKEY_CLASSES_ROOT\\TclFoobar set result } 1 -test registry-6.8 {GetValue} {pcOnly} { +test registry-6.8 {GetValue} {win} { registry set HKEY_CLASSES_ROOT\\TclFoobar val1 0x20 dword set result [registry get HKEY_CLASSES_ROOT\\TclFoobar val1] registry delete HKEY_CLASSES_ROOT\\TclFoobar set result } 32 -test registry-6.9 {GetValue} {pcOnly} { +test registry-6.9 {GetValue} {win} { registry set HKEY_CLASSES_ROOT\\TclFoobar val1 0x20 dword_big_endian set result [registry get HKEY_CLASSES_ROOT\\TclFoobar val1] registry delete HKEY_CLASSES_ROOT\\TclFoobar set result } 32 -test registry-6.10 {GetValue} {pcOnly} { +test registry-6.10 {GetValue} {win} { registry set HKEY_CLASSES_ROOT\\TclFoobar val1 1 link set result [registry get HKEY_CLASSES_ROOT\\TclFoobar val1] registry delete HKEY_CLASSES_ROOT\\TclFoobar set result } 1 -test registry-6.11 {GetValue} {pcOnly} { +test registry-6.11 {GetValue} {win} { registry set HKEY_CLASSES_ROOT\\TclFoobar val1 foobar multi_sz set result [registry get HKEY_CLASSES_ROOT\\TclFoobar val1] registry delete HKEY_CLASSES_ROOT\\TclFoobar set result } foobar -test registry-6.12 {GetValue} {pcOnly} { +test registry-6.12 {GetValue} {win} { registry set HKEY_CLASSES_ROOT\\TclFoobar val1 {foo\ bar baz} multi_sz set result [registry get HKEY_CLASSES_ROOT\\TclFoobar val1] registry delete HKEY_CLASSES_ROOT\\TclFoobar set result } {{foo bar} baz} -test registry-6.13 {GetValue} {pcOnly} { +test registry-6.13 {GetValue} {win} { registry set HKEY_CLASSES_ROOT\\TclFoobar val1 {} multi_sz set result [registry get HKEY_CLASSES_ROOT\\TclFoobar val1] registry delete HKEY_CLASSES_ROOT\\TclFoobar set result } {} test registry-6.14 {GetValue: truncation of multivalues with null elements} \ - {pcOnly} { + {win} { registry set HKEY_CLASSES_ROOT\\TclFoobar val1 {a {} b} multi_sz set result [registry get HKEY_CLASSES_ROOT\\TclFoobar val1] registry delete HKEY_CLASSES_ROOT\\TclFoobar set result } a -test registry-6.15 {GetValue} {pcOnly} { +test registry-6.15 {GetValue} {win} { registry set HKEY_CLASSES_ROOT\\TclFoobar val1 1 resource_list set result [registry get HKEY_CLASSES_ROOT\\TclFoobar val1] registry delete HKEY_CLASSES_ROOT\\TclFoobar set result } 1 -test registry-6.16 {GetValue: unknown types} {pcOnly} { +test registry-6.16 {GetValue: unknown types} {win} { registry set HKEY_CLASSES_ROOT\\TclFoobar val1 1 24 set result [registry get HKEY_CLASSES_ROOT\\TclFoobar val1] registry delete HKEY_CLASSES_ROOT\\TclFoobar set result } 1 -test registry-6.17 {GetValue: Unicode value names} {pcOnly} { +test registry-6.17 {GetValue: Unicode value names} {win} { registry set HKEY_CLASSES_ROOT\\TclFoobar val\u00c71 foobar multi_sz set result [registry get HKEY_CLASSES_ROOT\\TclFoobar val\u00c71] registry delete HKEY_CLASSES_ROOT\\TclFoobar set result } foobar -test registry-6.18 {GetValue: values with Unicode strings} {pcOnly nt} { +test registry-6.18 {GetValue: values with Unicode strings} {win nt} { registry set HKEY_CLASSES_ROOT\\TclFoobar val1 {foo ba\u30b7r baz} multi_sz set result [registry get HKEY_CLASSES_ROOT\\TclFoobar val1] registry delete HKEY_CLASSES_ROOT\\TclFoobar set result } "foo ba\u30b7r baz" -test registry-6.19 {GetValue: values with Unicode strings} {pcOnly english} { +test registry-6.19 {GetValue: values with Unicode strings} {win english} { registry set HKEY_CLASSES_ROOT\\TclFoobar val1 {foo ba\u00c7r baz} multi_sz set result [registry get HKEY_CLASSES_ROOT\\TclFoobar val1] registry delete HKEY_CLASSES_ROOT\\TclFoobar set result } "foo ba\u00c7r baz" -test registry-6.20 {GetValue: values with Unicode strings with embedded nulls} {pcOnly} { +test registry-6.20 {GetValue: values with Unicode strings with embedded nulls} {win} { registry set HKEY_CLASSES_ROOT\\TclFoobar val1 {foo ba\u0000r baz} multi_sz set result [registry get HKEY_CLASSES_ROOT\\TclFoobar val1] registry delete HKEY_CLASSES_ROOT\\TclFoobar set result } "foo ba r baz" -test registry-7.1 {GetValueNames: bad key} {pcOnly english} { +test registry-7.1 {GetValueNames: bad key} {win english} { registry delete HKEY_CLASSES_ROOT\\TclFoobar list [catch {registry values HKEY_CLASSES_ROOT\\TclFoobar} msg] $msg } {1 {unable to open key: The system cannot find the file specified.}} -test registry-7.2 {GetValueNames} {pcOnly} { +test registry-7.2 {GetValueNames} {win} { registry delete HKEY_CLASSES_ROOT\\TclFoobar registry set HKEY_CLASSES_ROOT\\TclFoobar baz foobar set result [registry values HKEY_CLASSES_ROOT\\TclFoobar] registry delete HKEY_CLASSES_ROOT\\TclFoobar set result } baz -test registry-7.3 {GetValueNames} {pcOnly} { +test registry-7.3 {GetValueNames} {win} { registry delete HKEY_CLASSES_ROOT\\TclFoobar registry set HKEY_CLASSES_ROOT\\TclFoobar baz foobar1 registry set HKEY_CLASSES_ROOT\\TclFoobar blat foobar2 @@ -467,20 +467,20 @@ test registry-7.3 {GetValueNames} {pcOnly} { registry delete HKEY_CLASSES_ROOT\\TclFoobar set result } {{} baz blat} -test registry-7.4 {GetValueNames: remote key} {pcOnly nonPortable english} { +test registry-7.4 {GetValueNames: remote key} {win nonPortable english} { registry set \\\\$hostname\\HKEY_CLASSES_ROOT\\TclFoobar baz blat set result [registry values \\\\$hostname\\HKEY_CLASSES_ROOT\\TclFoobar] registry delete \\\\$hostname\\HKEY_CLASSES_ROOT\\TclFoobar set result } baz -test registry-7.5 {GetValueNames: empty key} {pcOnly} { +test registry-7.5 {GetValueNames: empty key} {win} { registry delete HKEY_CLASSES_ROOT\\TclFoobar registry set HKEY_CLASSES_ROOT\\TclFoobar set result [registry values HKEY_CLASSES_ROOT\\TclFoobar] registry delete HKEY_CLASSES_ROOT\\TclFoobar set result } {} -test registry-7.6 {GetValueNames: patterns} {pcOnly} { +test registry-7.6 {GetValueNames: patterns} {win} { registry delete HKEY_CLASSES_ROOT\\TclFoobar registry set HKEY_CLASSES_ROOT\\TclFoobar baz foobar1 registry set HKEY_CLASSES_ROOT\\TclFoobar blat foobar2 @@ -489,7 +489,7 @@ test registry-7.6 {GetValueNames: patterns} {pcOnly} { registry delete HKEY_CLASSES_ROOT\\TclFoobar set result } {baz blat} -test registry-7.7 {GetValueNames: names with spaces} {pcOnly} { +test registry-7.7 {GetValueNames: names with spaces} {win} { registry delete HKEY_CLASSES_ROOT\\TclFoobar registry set HKEY_CLASSES_ROOT\\TclFoobar baz\ bar foobar1 registry set HKEY_CLASSES_ROOT\\TclFoobar blat foobar2 @@ -499,52 +499,52 @@ test registry-7.7 {GetValueNames: names with spaces} {pcOnly} { set result } {{baz bar} blat} -test registry-8.1 {OpenSubKey} {pcOnly nonPortable english} { +test registry-8.1 {OpenSubKey} {win nonPortable english} { # This test will only succeed if the current user does not have registry # access on the specified machine. list [catch {registry keys {\\mom\HKEY_LOCAL_MACHINE}} msg] $msg } {1 {unable to open key: Access is denied.}} -test registry-8.2 {OpenSubKey} {pcOnly} { +test registry-8.2 {OpenSubKey} {win} { registry delete HKEY_CLASSES_ROOT\\TclFoobar registry set HKEY_CLASSES_ROOT\\TclFoobar set result [registry keys HKEY_CLASSES_ROOT TclFoobar] registry delete HKEY_CLASSES_ROOT\\TclFoobar set result } TclFoobar -test registry-8.3 {OpenSubKey} {pcOnly english} { +test registry-8.3 {OpenSubKey} {win english} { registry delete HKEY_CLASSES_ROOT\\TclFoobar list [catch {registry keys HKEY_CLASSES_ROOT\\TclFoobar} msg] $msg } {1 {unable to open key: The system cannot find the file specified.}} -test registry-9.1 {ParseKeyName: bad keys} {pcOnly} { +test registry-9.1 {ParseKeyName: bad keys} {win} { list [catch {registry values \\} msg] $msg } "1 {bad key \"\\\": must start with a valid root}" -test registry-9.2 {ParseKeyName: bad keys} {pcOnly} { +test registry-9.2 {ParseKeyName: bad keys} {win} { list [catch {registry values \\foobar} msg] $msg } {1 {bad key "\foobar": must start with a valid root}} -test registry-9.3 {ParseKeyName: bad keys} {pcOnly} { +test registry-9.3 {ParseKeyName: bad keys} {win} { list [catch {registry values \\\\} msg] $msg } {1 {bad root name "": must be HKEY_LOCAL_MACHINE, HKEY_USERS, HKEY_CLASSES_ROOT, HKEY_CURRENT_USER, HKEY_CURRENT_CONFIG, HKEY_PERFORMANCE_DATA, or HKEY_DYN_DATA}} -test registry-9.4 {ParseKeyName: bad keys} {pcOnly} { +test registry-9.4 {ParseKeyName: bad keys} {win} { list [catch {registry values \\\\\\} msg] $msg } {1 {bad root name "": must be HKEY_LOCAL_MACHINE, HKEY_USERS, HKEY_CLASSES_ROOT, HKEY_CURRENT_USER, HKEY_CURRENT_CONFIG, HKEY_PERFORMANCE_DATA, or HKEY_DYN_DATA}} -test registry-9.5 {ParseKeyName: bad keys} {pcOnly english nt} { +test registry-9.5 {ParseKeyName: bad keys} {win english nt} { list [catch {registry values \\\\\\HKEY_CLASSES_ROOT} msg] $msg } {1 {unable to open key: The network address is invalid.}} -test registry-9.6 {ParseKeyName: bad keys} {pcOnly} { +test registry-9.6 {ParseKeyName: bad keys} {win} { list [catch {registry values \\\\gaspode} msg] $msg } {1 {bad root name "": must be HKEY_LOCAL_MACHINE, HKEY_USERS, HKEY_CLASSES_ROOT, HKEY_CURRENT_USER, HKEY_CURRENT_CONFIG, HKEY_PERFORMANCE_DATA, or HKEY_DYN_DATA}} -test registry-9.7 {ParseKeyName: bad keys} {pcOnly} { +test registry-9.7 {ParseKeyName: bad keys} {win} { list [catch {registry values foobar} msg] $msg } {1 {bad root name "foobar": must be HKEY_LOCAL_MACHINE, HKEY_USERS, HKEY_CLASSES_ROOT, HKEY_CURRENT_USER, HKEY_CURRENT_CONFIG, HKEY_PERFORMANCE_DATA, or HKEY_DYN_DATA}} -test registry-9.8 {ParseKeyName: null keys} {pcOnly} { +test registry-9.8 {ParseKeyName: null keys} {win} { list [catch {registry delete HKEY_CLASSES_ROOT\\} msg] $msg } {1 {bad key: cannot delete root keys}} -test registry-9.9 {ParseKeyName: null keys} {pcOnly english} { +test registry-9.9 {ParseKeyName: null keys} {win english} { list [catch {registry keys HKEY_CLASSES_ROOT\\TclFoobar\\baz} msg] $msg } {1 {unable to open key: The system cannot find the file specified.}} -test registry-10.1 {RecursiveDeleteKey} {pcOnly} { +test registry-10.1 {RecursiveDeleteKey} {win} { registry delete HKEY_CLASSES_ROOT\\TclFoobar registry set HKEY_CLASSES_ROOT\\TclFoobar\\test1 registry set HKEY_CLASSES_ROOT\\TclFoobar\\test2\\test3 @@ -552,7 +552,7 @@ test registry-10.1 {RecursiveDeleteKey} {pcOnly} { set result [registry keys HKEY_CLASSES_ROOT TclFoobar] set result } {} -test registry-10.2 {RecursiveDeleteKey} {pcOnly} { +test registry-10.2 {RecursiveDeleteKey} {win} { registry delete HKEY_CLASSES_ROOT\\TclFoobar registry set HKEY_CLASSES_ROOT\\TclFoobar\\test1 registry set HKEY_CLASSES_ROOT\\TclFoobar\\test2\\test3 @@ -561,36 +561,36 @@ test registry-10.2 {RecursiveDeleteKey} {pcOnly} { set result } {} -test registry-11.1 {SetValue: recursive creation} {pcOnly} { +test registry-11.1 {SetValue: recursive creation} {win} { registry delete HKEY_CLASSES_ROOT\\TclFoobar registry set HKEY_CLASSES_ROOT\\TclFoobar\\baz blat foobar set result [registry get HKEY_CLASSES_ROOT\\TclFoobar\\baz blat] } foobar -test registry-11.2 {SetValue: modification} {pcOnly} { +test registry-11.2 {SetValue: modification} {win} { registry delete HKEY_CLASSES_ROOT\\TclFoobar registry set HKEY_CLASSES_ROOT\\TclFoobar\\baz blat foobar registry set HKEY_CLASSES_ROOT\\TclFoobar\\baz blat frob set result [registry get HKEY_CLASSES_ROOT\\TclFoobar\\baz blat] } frob -test registry-11.3 {SetValue: failure} {pcOnly nonPortable english} { +test registry-11.3 {SetValue: failure} {win nonPortable english} { # This test will only succeed if the current user does not have registry # access on the specified machine. list [catch {registry set {\\mom\HKEY_CLASSES_ROOT\TclFoobar} bar foobar} msg] $msg } {1 {unable to open key: Access is denied.}} -test registry-12.1 {BroadcastValue} {pcOnly} { +test registry-12.1 {BroadcastValue} {win} { list [catch {registry broadcast} msg] $msg } {1 {wrong # args: should be "registry broadcast keyName ?-timeout millisecs?"}} -test registry-12.2 {BroadcastValue} {pcOnly} { +test registry-12.2 {BroadcastValue} {win} { list [catch {registry broadcast "" -time} msg] $msg } {1 {wrong # args: should be "registry broadcast keyName ?-timeout millisecs?"}} -test registry-12.3 {BroadcastValue} {pcOnly} { +test registry-12.3 {BroadcastValue} {win} { list [catch {registry broadcast "" - 500} msg] $msg } {1 {wrong # args: should be "registry broadcast keyName ?-timeout millisecs?"}} -test registry-12.4 {BroadcastValue} {pcOnly} { +test registry-12.4 {BroadcastValue} {win} { list [catch {registry broadcast {Environment}} msg] $msg } {0 {1 0}} -test registry-12.5 {BroadcastValue} {pcOnly} { +test registry-12.5 {BroadcastValue} {win} { list [catch {registry b {}} msg] $msg } {0 {1 0}} diff --git a/tests/socket.test b/tests/socket.test index 9a7bfc2..39af0f6 100644 --- a/tests/socket.test +++ b/tests/socket.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: socket.test,v 1.30 2004/05/19 20:15:32 dkf Exp $ +# RCS: @(#) $Id: socket.test,v 1.31 2004/06/23 15:36:58 dkf Exp $ # Running socket tests with a remote server: # ------------------------------------------ @@ -737,7 +737,7 @@ test socket-4.2 {byte order problems, socket numbers, htons} {socket} { } ok test socket-5.1 {byte order problems, socket numbers, htons} \ - {socket unixOnly notRoot} { + {socket unix notRoot} { set x {couldn't open socket: not owner} if {![catch {socket -server dodo 0x1} msg]} { set x {htons problem, should be disallowed, are you running as SU?} @@ -754,7 +754,7 @@ test socket-5.2 {byte order problems, socket numbers, htons} {socket} { set x } {couldn't open socket: port number too high} test socket-5.3 {byte order problems, socket numbers, htons} \ - {socket unixOnly notRoot} { + {socket unix notRoot} { set x {couldn't open socket: not owner} if {![catch {socket -server dodo 21} msg]} { set x {htons problem, should be disallowed, are you running as SU?} diff --git a/tests/tcltest.test b/tests/tcltest.test index 8aee3c5..9d0aa82 100755 --- a/tests/tcltest.test +++ b/tests/tcltest.test @@ -6,7 +6,7 @@ # Copyright (c) 2000 by Ajuba Solutions # All rights reserved. # -# RCS: @(#) $Id: tcltest.test,v 1.43 2004/05/26 16:25:01 dgp Exp $ +# RCS: @(#) $Id: tcltest.test,v 1.44 2004/06/23 15:36:58 dkf Exp $ # Note that there are several places where the value of # tcltest::currentFailure is stored/reset in the -setup/-cleanup @@ -561,7 +561,7 @@ switch $tcl_platform(platform) { } } -test tcltest-8.3 {tcltest a.tcl -tmpdir notReadableDir} {unixOnly notRoot} { +test tcltest-8.3 {tcltest a.tcl -tmpdir notReadableDir} {unix notRoot} { slave msg $a -tmpdir $notReadableDir string match {*not readable*} $msg } {1} @@ -621,7 +621,7 @@ test tcltest-8.11 {tcltest a.tcl -testdir thisdirectoryisafile} {unixOrPc} { string match "*not a directory*" $msg } {1} -test tcltest-8.12 {tcltest a.tcl -testdir notReadableDir} {unixOnly notRoot} { +test tcltest-8.12 {tcltest a.tcl -testdir notReadableDir} {unix notRoot} { slave msg $a -testdir $notReadableDir string match {*not readable*} $msg } {1} diff --git a/tests/unixFCmd.test b/tests/unixFCmd.test index 32b3d68..bdead08 100644 --- a/tests/unixFCmd.test +++ b/tests/unixFCmd.test @@ -9,7 +9,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: unixFCmd.test,v 1.20 2004/05/19 20:15:32 dkf Exp $ +# RCS: @(#) $Id: unixFCmd.test,v 1.21 2004/06/23 15:36:58 dkf Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest @@ -59,7 +59,7 @@ proc cleanup {args} { } } -test unixFCmd-1.1 {TclpRenameFile: EACCES} {unixOnly notRoot} { +test unixFCmd-1.1 {TclpRenameFile: EACCES} {unix notRoot} { cleanup file mkdir td1/td2/td3 file attributes td1/td2 -permissions 0000 @@ -67,29 +67,29 @@ test unixFCmd-1.1 {TclpRenameFile: EACCES} {unixOnly notRoot} { file attributes td1/td2 -permissions 0755 set msg } {1 {error renaming "td1/td2/td3": permission denied}} -test unixFCmd-1.2 {TclpRenameFile: EEXIST} {unixOnly notRoot} { +test unixFCmd-1.2 {TclpRenameFile: EEXIST} {unix notRoot} { cleanup file mkdir td1/td2 file mkdir td2 list [catch {file rename td2 td1} msg] $msg } {1 {error renaming "td2" to "td1/td2": file already exists}} -test unixFCmd-1.3 {TclpRenameFile: EINVAL} {unixOnly notRoot} { +test unixFCmd-1.3 {TclpRenameFile: EINVAL} {unix notRoot} { cleanup file mkdir td1 list [catch {file rename td1 td1} msg] $msg } {1 {error renaming "td1" to "td1/td1": trying to rename a volume or move a directory into itself}} -test unixFCmd-1.4 {TclpRenameFile: EISDIR} {emptyTest unixOnly notRoot} { +test unixFCmd-1.4 {TclpRenameFile: EISDIR} {emptyTest unix notRoot} { # can't make it happen } {} -test unixFCmd-1.5 {TclpRenameFile: ENOENT} {unixOnly notRoot} { +test unixFCmd-1.5 {TclpRenameFile: ENOENT} {unix notRoot} { cleanup file mkdir td1 list [catch {file rename td2 td1} msg] $msg } {1 {error renaming "td2": no such file or directory}} -test unixFCmd-1.6 {TclpRenameFile: ENOTDIR} {emptyTest unixOnly notRoot} { +test unixFCmd-1.6 {TclpRenameFile: ENOTDIR} {emptyTest unix notRoot} { # can't make it happen } {} -test unixFCmd-1.7 {TclpRenameFile: EXDEV} {unixOnly notRoot} { +test unixFCmd-1.7 {TclpRenameFile: EXDEV} {unix notRoot} { cleanup file mkdir foo/bar file attr foo -perm 040555 @@ -100,12 +100,12 @@ test unixFCmd-1.7 {TclpRenameFile: EXDEV} {unixOnly notRoot} { catch {file delete -force foo} list $catchResult $msg } {1 { permission denied}} -test unixFCmd-1.8 {Checking EINTR Bug} {unixOnly notRoot nonPortable} { +test unixFCmd-1.8 {Checking EINTR Bug} {unix notRoot nonPortable} { testalarm after 2000 list [testgotsig] [testgotsig] } {1 0} -test unixFCmd-1.9 {Checking EINTR Bug} {unixOnly notRoot nonPortable} { +test unixFCmd-1.9 {Checking EINTR Bug} {unix notRoot nonPortable} { cleanup set f [open tfalarm w] puts $f { @@ -121,13 +121,13 @@ test unixFCmd-1.9 {Checking EINTR Bug} {unixOnly notRoot nonPortable} { list $line [testgotsig] } {h 1} test unixFCmd-2.1 {TclpCopyFile: target exists: lstat(dst) == 0} \ - {unixOnly notRoot} { + {unix notRoot} { cleanup close [open tf1 a] close [open tf2 a] file copy -force tf1 tf2 } {} -test unixFCmd-2.2.1 {TclpCopyFile: src is symlink} {unixOnly notRoot dontCopyLinks} { +test unixFCmd-2.2.1 {TclpCopyFile: src is symlink} {unix notRoot dontCopyLinks} { # copying links should end up with real files cleanup close [open tf1 a] @@ -135,7 +135,7 @@ test unixFCmd-2.2.1 {TclpCopyFile: src is symlink} {unixOnly notRoot dontCopyLin file copy tf2 tf3 file type tf3 } {file} -test unixFCmd-2.2.2 {TclpCopyFile: src is symlink} {unixOnly notRoot} { +test unixFCmd-2.2.2 {TclpCopyFile: src is symlink} {unix notRoot} { # copying links should end up with the links copied cleanup close [open tf1 a] @@ -143,7 +143,7 @@ test unixFCmd-2.2.2 {TclpCopyFile: src is symlink} {unixOnly notRoot} { file copy tf2 tf3 file type tf3 } {link} -test unixFCmd-2.3 {TclpCopyFile: src is block} {unixOnly notRoot} { +test unixFCmd-2.3 {TclpCopyFile: src is block} {unix notRoot} { cleanup set null "/dev/null" while {[file type $null] != "characterSpecial"} { @@ -151,7 +151,7 @@ test unixFCmd-2.3 {TclpCopyFile: src is block} {unixOnly notRoot} { } # file copy $null tf1 } {} -test unixFCmd-2.4 {TclpCopyFile: src is fifo} {unixOnly notRoot} { +test unixFCmd-2.4 {TclpCopyFile: src is fifo} {unix notRoot} { cleanup if [catch {exec mknod tf1 p}] { list 1 @@ -160,7 +160,7 @@ test unixFCmd-2.4 {TclpCopyFile: src is fifo} {unixOnly notRoot} { expr {"[file type tf1]" == "[file type tf2]"} } } {1} -test unixFCmd-2.5 {TclpCopyFile: copy attributes} {unixOnly notRoot} { +test unixFCmd-2.5 {TclpCopyFile: copy attributes} {unix notRoot} { cleanup close [open tf1 a] file attributes tf1 -permissions 0472 @@ -168,59 +168,59 @@ test unixFCmd-2.5 {TclpCopyFile: copy attributes} {unixOnly notRoot} { file attributes tf2 -permissions } 00472 ;# i.e. perms field of [exec ls -l tf2] is -r--rwx-w- -test unixFCmd-3.1 {CopyFile not done} {emptyTest unixOnly notRoot} { +test unixFCmd-3.1 {CopyFile not done} {emptyTest unix notRoot} { } {} -test unixFCmd-4.1 {TclpDeleteFile not done} {emptyTest unixOnly notRoot} { +test unixFCmd-4.1 {TclpDeleteFile not done} {emptyTest unix notRoot} { } {} -test unixFCmd-5.1 {TclpCreateDirectory not done} {emptyTest unixOnly notRoot} { +test unixFCmd-5.1 {TclpCreateDirectory not done} {emptyTest unix notRoot} { } {} -test unixFCmd-6.1 {TclpCopyDirectory not done} {emptyTest unixOnly notRoot} { +test unixFCmd-6.1 {TclpCopyDirectory not done} {emptyTest unix notRoot} { } {} -test unixFCmd-7.1 {TclpRemoveDirectory not done} {emptyTest unixOnly notRoot} { +test unixFCmd-7.1 {TclpRemoveDirectory not done} {emptyTest unix notRoot} { } {} -test unixFCmd-8.1 {TraverseUnixTree not done} {emptyTest unixOnly notRoot} { +test unixFCmd-8.1 {TraverseUnixTree not done} {emptyTest unix notRoot} { } {} -test unixFCmd-9.1 {TraversalCopy not done} {emptyTest unixOnly notRoot} { +test unixFCmd-9.1 {TraversalCopy not done} {emptyTest unix notRoot} { } {} -test unixFCmd-10.1 {TraversalDelete not done} {emptyTest unixOnly notRoot} { +test unixFCmd-10.1 {TraversalDelete not done} {emptyTest unix notRoot} { } {} -test unixFCmd-11.1 {CopyFileAttrs not done} {emptyTest unixOnly notRoot} { +test unixFCmd-11.1 {CopyFileAttrs not done} {emptyTest unix notRoot} { } {} -test unixFCmd-12.1 {GetGroupAttribute - file not found} {unixOnly notRoot} { +test unixFCmd-12.1 {GetGroupAttribute - file not found} {unix notRoot} { catch {file delete -force -- foo.test} list [catch {file attributes foo.test -group} msg] $msg } {1 {could not read "foo.test": no such file or directory}} -test unixFCmd-12.2 {GetGroupAttribute - file found} {unixOnly notRoot} { +test unixFCmd-12.2 {GetGroupAttribute - file found} {unix notRoot} { catch {file delete -force -- foo.test} close [open foo.test w] list [catch {file attributes foo.test -group}] [file delete -force -- foo.test] } {0 {}} -test unixFCmd-13.1 {GetOwnerAttribute - file not found} {unixOnly notRoot} { +test unixFCmd-13.1 {GetOwnerAttribute - file not found} {unix notRoot} { catch {file delete -force -- foo.test} list [catch {file attributes foo.test -group} msg] $msg } {1 {could not read "foo.test": no such file or directory}} -test unixFCmd-13.2 {GetOwnerAttribute} {unixOnly notRoot} { +test unixFCmd-13.2 {GetOwnerAttribute} {unix notRoot} { catch {file delete -force -- foo.test} close [open foo.test w] list [catch {file attributes foo.test -owner} msg] \ [string compare $msg $user] [file delete -force -- foo.test] } {0 0 {}} -test unixFCmd-14.1 {GetPermissionsAttribute - file not found} {unixOnly notRoot} { +test unixFCmd-14.1 {GetPermissionsAttribute - file not found} {unix notRoot} { catch {file delete -force -- foo.test} list [catch {file attributes foo.test -permissions} msg] $msg } {1 {could not read "foo.test": no such file or directory}} -test unixFCmd-14.2 {GetPermissionsAttribute} {unixOnly notRoot} { +test unixFCmd-14.2 {GetPermissionsAttribute} {unix notRoot} { catch {file delete -force -- foo.test} close [open foo.test w] list [catch {file attribute foo.test -permissions}] \ @@ -240,53 +240,53 @@ if {$tcl_platform(platform) == "unix"} { testConstraint foundGroup $foundgroup #groups hard to test -test unixFCmd-15.1 {SetGroupAttribute - invalid group} {unixOnly notRoot} { +test unixFCmd-15.1 {SetGroupAttribute - invalid group} {unix notRoot} { catch {file delete -force -- foo.test} list [catch {file attributes foo.test -group foozzz} msg] \ $msg [file delete -force -- foo.test] } {1 {could not set group for file "foo.test": group "foozzz" does not exist} {}} test unixFCmd-15.2 {SetGroupAttribute - invalid file} \ - {unixOnly notRoot foundGroup} { + {unix notRoot foundGroup} { catch {file delete -force -- foo.test} list [catch {file attributes foo.test -group $group} msg] $msg } {1 {could not set group for file "foo.test": no such file or directory}} #changing owners hard to do -test unixFCmd-16.1 {SetOwnerAttribute - current owner} {unixOnly notRoot} { +test unixFCmd-16.1 {SetOwnerAttribute - current owner} {unix notRoot} { catch {file delete -force -- foo.test} close [open foo.test w] list [catch {file attributes foo.test -owner $user} msg] \ $msg [string compare [file attributes foo.test -owner] $user] \ [file delete -force -- foo.test] } {0 {} 0 {}} -test unixFCmd-16.2 {SetOwnerAttribute - invalid file} {unixOnly notRoot} { +test unixFCmd-16.2 {SetOwnerAttribute - invalid file} {unix notRoot} { catch {file delete -force -- foo.test} list [catch {file attributes foo.test -owner $user} msg] $msg } {1 {could not set owner for file "foo.test": no such file or directory}} -test unixFCmd-16.3 {SetOwnerAttribute - invalid owner} {unixOnly notRoot} { +test unixFCmd-16.3 {SetOwnerAttribute - invalid owner} {unix notRoot} { catch {file delete -force -- foo.test} list [catch {file attributes foo.test -owner foozzz} msg] $msg } {1 {could not set owner for file "foo.test": user "foozzz" does not exist}} -test unixFCmd-17.1 {SetPermissionsAttribute} {unixOnly notRoot} { +test unixFCmd-17.1 {SetPermissionsAttribute} {unix notRoot} { catch {file delete -force -- foo.test} close [open foo.test w] list [catch {file attributes foo.test -permissions 0000} msg] \ $msg [file attributes foo.test -permissions] \ [file delete -force -- foo.test] } {0 {} 00000 {}} -test unixFCmd-17.2 {SetPermissionsAttribute} {unixOnly notRoot} { +test unixFCmd-17.2 {SetPermissionsAttribute} {unix notRoot} { catch {file delete -force -- foo.test} list [catch {file attributes foo.test -permissions 0000} msg] $msg } {1 {could not set permissions for file "foo.test": no such file or directory}} -test unixFCmd-17.3 {SetPermissionsAttribute} {unixOnly notRoot} { +test unixFCmd-17.3 {SetPermissionsAttribute} {unix notRoot} { catch {file delete -force -- foo.test} close [open foo.test w] list [catch {file attributes foo.test -permissions foo} msg] $msg \ [file delete -force -- foo.test] } {1 {unknown permission string format "foo"} {}} -test unixFCmd-17.4 {SetPermissionsAttribute} {unixOnly notRoot} { +test unixFCmd-17.4 {SetPermissionsAttribute} {unix notRoot} { catch {file delete -force -- foo.test} close [open foo.test w] list [catch {file attributes foo.test -permissions ---rwx} msg] $msg \ @@ -296,7 +296,7 @@ test unixFCmd-17.4 {SetPermissionsAttribute} {unixOnly notRoot} { close [open foo.test w] set ::i 4 proc permcheck {testnum permstr expected} { - test $testnum {SetPermissionsAttribute} {unixOnly notRoot} { + test $testnum {SetPermissionsAttribute} {unix notRoot} { file attributes foo.test -permissions $permstr file attributes foo.test -permissions } $expected @@ -311,7 +311,7 @@ permcheck unixFCmd-17.11 --x--x--x 00111 permcheck unixFCmd-17.12 a+rwx 00777 file delete -force -- foo.test -test unixFCmd-18.1 {Unix pwd} {nonPortable unixOnly notRoot} { +test unixFCmd-18.1 {Unix pwd} {nonPortable unix notRoot} { # This test is nonportable because SunOS generates a weird error # message when the current directory isn't readable. set cd [pwd] @@ -339,18 +339,18 @@ if {$tcl_platform(platform) == "unix"} { } testConstraint readonlyAttr $roattr -test unixFCmd-19.1 {GetReadOnlyAttribute - file not found} {unixOnly notRoot readonlyAttr} { +test unixFCmd-19.1 {GetReadOnlyAttribute - file not found} {unix notRoot readonlyAttr} { catch {file delete -force -- foo.test} list [catch {file attributes foo.test -readonly} msg] $msg } {1 {could not read "foo.test": no such file or directory}} -test unixFCmd-19.2 {GetReadOnlyAttribute} {unixOnly notRoot readonlyAttr} { +test unixFCmd-19.2 {GetReadOnlyAttribute} {unix notRoot readonlyAttr} { catch {file delete -force -- foo.test} close [open foo.test w] list [catch {file attribute foo.test -readonly} msg] $msg \ [file delete -force -- foo.test] } {0 0 {}} -test unixFCmd-20.1 {SetReadOnlyAttribute} {unixOnly notRoot readonlyAttr} { +test unixFCmd-20.1 {SetReadOnlyAttribute} {unix notRoot readonlyAttr} { catch {file delete -force -- foo.test} close [open foo.test w] list [catch {file attributes foo.test -readonly 1} msg] $msg \ @@ -360,7 +360,7 @@ test unixFCmd-20.1 {SetReadOnlyAttribute} {unixOnly notRoot readonlyAttr} { [catch {file attribute foo.test -readonly} msg] $msg \ [file delete -force -- foo.test] } {0 {} 0 1 1 0 {} 0 0 {}} -test unixFCmd-20.2 {SetReadOnlyAttribute} {unixOnly notRoot readonlyAttr} { +test unixFCmd-20.2 {SetReadOnlyAttribute} {unix notRoot readonlyAttr} { catch {file delete -force -- foo.test} list [catch {file attributes foo.test -readonly 1} msg] $msg } {1 {could not read "foo.test": no such file or directory}} diff --git a/tests/unixFile.test b/tests/unixFile.test index 22c3885..8e37b5d 100644 --- a/tests/unixFile.test +++ b/tests/unixFile.test @@ -9,7 +9,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: unixFile.test,v 1.8 2004/05/19 20:15:32 dkf Exp $ +# RCS: @(#) $Id: unixFile.test,v 1.9 2004/06/23 15:36:58 dkf Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest @@ -27,31 +27,31 @@ catch { } set absPath [file join [temporaryDirectory] junk] -test unixFile-1.1 {Tcl_FindExecutable} {testfindexecutable unixOnly} { +test unixFile-1.1 {Tcl_FindExecutable} {testfindexecutable unix} { set env(PATH) "" testfindexecutable junk } $absPath -test unixFile-1.2 {Tcl_FindExecutable} {testfindexecutable unixOnly} { +test unixFile-1.2 {Tcl_FindExecutable} {testfindexecutable unix} { set env(PATH) "/dummy" testfindexecutable junk } {} -test unixFile-1.3 {Tcl_FindExecutable} {testfindexecutable unixOnly} { +test unixFile-1.3 {Tcl_FindExecutable} {testfindexecutable unix} { set env(PATH) "/dummy:[pwd]" testfindexecutable junk } $absPath -test unixFile-1.4 {Tcl_FindExecutable} {testfindexecutable unixOnly} { +test unixFile-1.4 {Tcl_FindExecutable} {testfindexecutable unix} { set env(PATH) "/dummy:" testfindexecutable junk } $absPath -test unixFile-1.5 {Tcl_FindExecutable} {testfindexecutable unixOnly} { +test unixFile-1.5 {Tcl_FindExecutable} {testfindexecutable unix} { set env(PATH) "/dummy:/dummy" testfindexecutable junk } {} -test unixFile-1.6 {Tcl_FindExecutable} {testfindexecutable unixOnly} { +test unixFile-1.6 {Tcl_FindExecutable} {testfindexecutable unix} { set env(PATH) "/dummy::/dummy" testfindexecutable junk } $absPath -test unixFile-1.7 {Tcl_FindExecutable} {testfindexecutable unixOnly} { +test unixFile-1.7 {Tcl_FindExecutable} {testfindexecutable unix} { set env(PATH) ":/dummy" testfindexecutable junk } $absPath diff --git a/tests/unixInit.test b/tests/unixInit.test index 89e5d78..350c748 100644 --- a/tests/unixInit.test +++ b/tests/unixInit.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: unixInit.test,v 1.39 2004/06/11 22:39:29 dgp Exp $ +# RCS: @(#) $Id: unixInit.test,v 1.40 2004/06/23 15:36:58 dkf Exp $ package require tcltest 2 namespace import -force ::tcltest::* @@ -18,7 +18,7 @@ unset -nocomplain path catch {set oldlang $env(LANG)} set env(LANG) C -test unixInit-1.1 {TclpInitPlatform: ignore SIGPIPE} {unixOnly stdio} { +test unixInit-1.1 {TclpInitPlatform: ignore SIGPIPE} {unix stdio} { set x {} # Watch out for a race condition here. If tcltest is too slow to start @@ -44,7 +44,7 @@ test unixInit-1.1 {TclpInitPlatform: ignore SIGPIPE} {unixOnly stdio} { # This test is really a test of code in tclUnixChan.c, but the # channels are set up as part of initialisation of the interpreter so # the test seems to me to fit here as well as anywhere else. -test unixInit-1.2 {initialisation: standard channel type deduction} {unixOnly stdio} { +test unixInit-1.2 {initialisation: standard channel type deduction} {unix stdio} { # pipe1 is a connection to a server that reports what port it # starts on, and delivers a constant string to the first client to # connect to that port before exiting. @@ -109,7 +109,7 @@ proc getlibpath [list [list program [interpreter]]] { testConstraint testgetdefenc [llength [info commands testgetdefenc]] test unixInit-2.0 {TclpInitLibraryPath: setting tclDefaultEncodingDir} \ - {unixOnly testgetdefenc} { + {unix testgetdefenc} { set origDir [testgetdefenc] testsetdefenc slappy set path [testgetdefenc] @@ -117,7 +117,7 @@ test unixInit-2.0 {TclpInitLibraryPath: setting tclDefaultEncodingDir} \ set path } {slappy} test unixInit-2.1 {TclpInitLibraryPath: value of installLib, developLib} \ - {unixOnly stdio knownBug} { + {unix stdio knownBug} { set path [getlibpath] set installLib lib/tcl[info tclversion] @@ -130,7 +130,7 @@ test unixInit-2.1 {TclpInitLibraryPath: value of installLib, developLib} \ set x } {0 0} test unixInit-2.2 {TclpInitLibraryPath: TCL_LIBRARY} -constraints { - unixOnly stdio knownBug + unix stdio knownBug } -setup { if {[info exists env(TCL_LIBRARY)]} { set oldlibrary $env(TCL_LIBRARY) @@ -150,7 +150,7 @@ test unixInit-2.2 {TclpInitLibraryPath: TCL_LIBRARY} -constraints { } } -result "sparkly" test unixInit-2.3 {TclpInitLibraryPath: TCL_LIBRARY wrong version} -constraints { - unixOnly stdio knownBug + unix stdio knownBug } -setup { if {[info exists env(TCL_LIBRARY)]} { set oldlibrary $env(TCL_LIBRARY) @@ -170,7 +170,7 @@ test unixInit-2.3 {TclpInitLibraryPath: TCL_LIBRARY wrong version} -constraints } } -result [list /a/b/tcl1.7 /a/b/tcl[info tclversion]] test unixInit-2.4 {TclpInitLibraryPath: TCL_LIBRARY: INTL} -constraints { - unixOnly stdio knownBug + unix stdio knownBug } -setup { if {[info exists env(TCL_LIBRARY)]} { set oldlibrary $env(TCL_LIBRARY) @@ -191,11 +191,11 @@ test unixInit-2.4 {TclpInitLibraryPath: TCL_LIBRARY: INTL} -constraints { } } -result "\xa7" test unixInit-2.5 {TclpInitLibraryPath: compiled-in library path} \ - {emptyTest unixOnly} { + {emptyTest unix} { # cannot test } {} test unixInit-2.6 {TclpInitLibraryPath: executable relative} \ - {unixOnly stdio knownBug} { + {unix stdio knownBug} { makeDirectory tmp makeDirectory [file join tmp sparkly] makeDirectory [file join tmp sparkly bin] @@ -216,7 +216,7 @@ test unixInit-2.6 {TclpInitLibraryPath: executable relative} \ set x } [list [temporaryDirectory]/tmp/sparkly/lib/tcl[info tclversion] [temporaryDirectory]/tmp/lib/tcl[info tclversion]] test unixInit-2.7 {TclpInitLibraryPath: compiled-in library path} \ - {emptyTest unixOnly} { + {emptyTest unix} { # would need test command to get defaultLibDir and compare it to # [lindex $auto_path end] } {} @@ -298,7 +298,7 @@ test unixInit-2.9 {TclpInitLibraryPath: paths relative to executable} {unix noSp /tmp/library /library /tcl[info patchlevel]/library] test unixInit-2.10 {TclpInitLibraryPath: executable relative} -constraints { - unixOnly stdio knownBug + unix stdio knownBug } -setup { set tmpDir [makeDirectory tmp] set sparklyDir [makeDirectory sparkly $tmpDir] @@ -336,7 +336,7 @@ test unixInit-2.10 {TclpInitLibraryPath: executable relative} -constraints { [file join [temporaryDirectory] tmp library] ] test unixInit-3.1 {TclpSetInitialEncodings} -constraints { - unixOnly stdio + unix stdio } -body { set env(LANG) C @@ -351,7 +351,7 @@ test unixInit-3.1 {TclpSetInitialEncodings} -constraints { } -match regexp -result [expr { ($tcl_platform(os) eq "Darwin") ? "^utf-8$" : "^iso8859-15?$"}] -test unixInit-3.2 {TclpSetInitialEncodings} {unixOnly stdio} { +test unixInit-3.2 {TclpSetInitialEncodings} {unix stdio} { set env(LANG) japanese catch {set oldlc_all $env(LC_ALL)} set env(LC_ALL) japanese @@ -375,7 +375,7 @@ test unixInit-3.2 {TclpSetInitialEncodings} {unixOnly stdio} { expr {[lsearch -exact $validEncodings $enc] < 0} } 0 -test unixInit-4.1 {TclpSetVariables} {unixOnly} { +test unixInit-4.1 {TclpSetVariables} {unix} { # just make sure they exist set a [list $tcl_library $tcl_pkgPath $tcl_platform(os)] @@ -383,15 +383,15 @@ test unixInit-4.1 {TclpSetVariables} {unixOnly} { set tcl_platform(platform) } "unix" -test unixInit-5.1 {Tcl_Init} {emptyTest unixOnly} { +test unixInit-5.1 {Tcl_Init} {emptyTest unix} { # test initScript } {} -test unixInit-6.1 {Tcl_SourceRCFile} {emptyTest unixOnly} { +test unixInit-6.1 {Tcl_SourceRCFile} {emptyTest unix} { } {} test unixInit-7.1 {closed standard channel: Bug 772288} -constraints { - unixOnly stdio + unix stdio } -body { set tclsh [interpreter] makeFile {puts [open /dev/null]} crash.tcl diff --git a/tests/unixNotfy.test b/tests/unixNotfy.test index 49dc015..b8f8e95 100644 --- a/tests/unixNotfy.test +++ b/tests/unixNotfy.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: unixNotfy.test,v 1.15 2004/06/22 13:09:02 vasiljevic Exp $ +# RCS: @(#) $Id: unixNotfy.test,v 1.16 2004/06/23 15:36:58 dkf Exp $ # The tests should not be run if you have a notifier which is unable to # detect infinite vwaits, as the tests below will hang. The presence of @@ -30,7 +30,7 @@ testConstraint testthread [expr {[info commands testthread] != {}}] # an error. test unixNotfy-1.1 {Tcl_DeleteFileHandler} \ - -constraints {noTk && unixOnly && !testthread} \ + -constraints {noTk && unix && !testthread} \ -body { catch {vwait x} set f [open [makeFile "" foo] w] @@ -45,7 +45,7 @@ test unixNotfy-1.1 {Tcl_DeleteFileHandler} \ catch { removeFile foo } } test unixNotfy-1.2 {Tcl_DeleteFileHandler} \ - -constraints {noTk && unixOnly && !testthread} \ + -constraints {noTk && unix && !testthread} \ -body { catch {vwait x} set f1 [open [makeFile "" foo] w] @@ -67,7 +67,7 @@ test unixNotfy-1.2 {Tcl_DeleteFileHandler} \ } test unixNotfy-2.1 {Tcl_DeleteFileHandler} \ - -constraints {noTk unixOnly testthread} \ + -constraints {noTk unix testthread} \ -body { update set f [open [makeFile "" foo] w] @@ -85,7 +85,7 @@ test unixNotfy-2.1 {Tcl_DeleteFileHandler} \ catch { removeFile foo } } test unixNotfy-2.2 {Tcl_DeleteFileHandler} \ - -constraints {noTk unixOnly testthread} \ + -constraints {noTk unix testthread} \ -body { update set f1 [open [makeFile "" foo] w] diff --git a/tests/winConsole.test b/tests/winConsole.test index 2d0e9e5..6b8b2db 100644 --- a/tests/winConsole.test +++ b/tests/winConsole.test @@ -9,7 +9,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: winConsole.test,v 1.6 2003/11/14 20:44:47 dgp Exp $ +# RCS: @(#) $Id: winConsole.test,v 1.7 2004/06/23 15:36:58 dkf Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest @@ -17,9 +17,7 @@ if {[lsearch [namespace children] ::tcltest] == -1} { } -test winConsole-1.1 {Console file channel: non-blocking gets} \ - {pcOnly interactive} { - +test winConsole-1.1 {Console file channel: non-blocking gets} {win interactive} { set oldmode [fconfigure stdin] puts stdout "Enter abcdef<return> now: " nonewline diff --git a/tests/winDde.test b/tests/winDde.test index 850d839..59ab841 100644 --- a/tests/winDde.test +++ b/tests/winDde.test @@ -9,7 +9,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: winDde.test,v 1.20 2004/05/19 20:15:32 dkf Exp $ +# RCS: @(#) $Id: winDde.test,v 1.21 2004/06/23 15:36:58 dkf Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest 2 @@ -112,49 +112,49 @@ proc createChildProcess { ddeServerName {handler {}}} { # ------------------------------------------------------------------------- -test winDde-1.1 {Settings the server's topic name} {pcOnly dde} { +test winDde-1.1 {Settings the server's topic name} {win dde} { list [dde servername foobar] [dde servername] [dde servername self] } {foobar foobar self} -test winDde-2.1 {Checking for other services} {pcOnly dde} { +test winDde-2.1 {Checking for other services} {win dde} { expr [llength [dde services {} {}]] >= 0 } 1 test winDde-2.2 {Checking for existence, with service and topic specified} \ - {pcOnly dde} { + {win dde} { llength [dde services TclEval self] } 1 test winDde-2.3 {Checking for existence, with only the service specified} \ - {pcOnly dde} { + {win dde} { expr [llength [dde services TclEval {}]] >= 1 } 1 test winDde-2.4 {Checking for existence, with only the topic specified} \ - {pcOnly dde} { + {win dde} { expr [llength [dde services {} self]] >= 1 } 1 # ------------------------------------------------------------------------- -test winDde-3.1 {DDE execute locally} {pcOnly dde} { +test winDde-3.1 {DDE execute locally} {win dde} { set a "" dde execute TclEval self {set a "foo"} set a } foo -test winDde-3.2 {DDE execute -async locally} {pcOnly dde} { +test winDde-3.2 {DDE execute -async locally} {win dde} { set a "" dde execute -async TclEval self {set a "foo"} update set a } foo -test winDde-3.3 {DDE request locally} {pcOnly dde} { +test winDde-3.3 {DDE request locally} {win dde} { set a "" dde execute TclEval self {set a "foo"} dde request TclEval self a } foo -test winDde-3.4 {DDE eval locally} {pcOnly dde} { +test winDde-3.4 {DDE eval locally} {win dde} { set a "" dde eval self set a "foo" } foo -test winDde-3.5 {DDE request locally} {pcOnly dde} { +test winDde-3.5 {DDE request locally} {win dde} { set a "" dde execute TclEval self {set a "foo"} dde request -binary TclEval self a @@ -162,7 +162,7 @@ test winDde-3.5 {DDE request locally} {pcOnly dde} { # ------------------------------------------------------------------------- -test winDde-4.1 {DDE execute remotely} {stdio pcOnly dde} { +test winDde-4.1 {DDE execute remotely} {stdio win dde} { set a "" set name child-4.1 set child [createChildProcess $name] @@ -171,7 +171,7 @@ test winDde-4.1 {DDE execute remotely} {stdio pcOnly dde} { update set a } "" -test winDde-4.2 {DDE execute async remotely} {stdio pcOnly dde} { +test winDde-4.2 {DDE execute async remotely} {stdio win dde} { set a "" set name child-4.2 set child [createChildProcess $name] @@ -180,7 +180,7 @@ test winDde-4.2 {DDE execute async remotely} {stdio pcOnly dde} { update set a } "" -test winDde-4.3 {DDE request remotely} {stdio pcOnly dde} { +test winDde-4.3 {DDE request remotely} {stdio win dde} { set a "" set name chile-4.3 set child [createChildProcess $name] @@ -190,7 +190,7 @@ test winDde-4.3 {DDE request remotely} {stdio pcOnly dde} { update set a } foo -test winDde-4.4 {DDE eval remotely} {stdio pcOnly dde} { +test winDde-4.4 {DDE eval remotely} {stdio win dde} { set a "" set name child-4.4 set child [createChildProcess $name] @@ -202,37 +202,37 @@ test winDde-4.4 {DDE eval remotely} {stdio pcOnly dde} { # ------------------------------------------------------------------------- -test winDde-5.1 {check for bad arguments} {pcOnly dde} { +test winDde-5.1 {check for bad arguments} {win dde} { catch {dde execute "" "" "" ""} result set result } {wrong # args: should be "dde execute ?-async? serviceName topicName value"} -test winDde-5.2 {check for bad arguments} {pcOnly dde} { +test winDde-5.2 {check for bad arguments} {win dde} { catch {dde execute "" "" ""} result set result } {cannot execute null data} -test winDde-5.3 {check for bad arguments} {pcOnly dde} { +test winDde-5.3 {check for bad arguments} {win dde} { catch {dde execute -foo "" "" ""} result set result } {wrong # args: should be "dde execute ?-async? serviceName topicName value"} -test winDde-5.4 {DDE eval bad arguments} {pcOnly dde} { +test winDde-5.4 {DDE eval bad arguments} {win dde} { list [catch {dde eval "" "foo"} msg] $msg } {1 {invalid service name ""}} # ------------------------------------------------------------------------- -test winDde-6.1 {DDE servername bad arguments} -constraints {pcOnly dde} -body { +test winDde-6.1 {DDE servername bad arguments} -constraints {win dde} -body { dde servername -z -z -z } -returnCodes error -result {wrong # args: should be "dde servername ?-force? ?-handler proc? ?--? ?serverName?"} -test winDde-6.2 {DDE servername set name} -constraints {pcOnly dde} \ +test winDde-6.2 {DDE servername set name} -constraints {win dde} \ -body {dde servername -- winDde-6.2} \ -result {winDde-6.2} -test winDde-6.3 {DDE servername set exact name} -constraints {pcOnly dde} \ +test winDde-6.3 {DDE servername set exact name} -constraints {win dde} \ -body {dde servername -force winDde-6.3} \ -result {winDde-6.3} -test winDde-6.4 {DDE servername set exact name} -constraints {pcOnly dde} \ +test winDde-6.4 {DDE servername set exact name} -constraints {win dde} \ -body {dde servername -force -- winDde-6.4} \ -result {winDde-6.4} -test winDde-6.5 {DDE remote servername collision} -constraints {stdio pcOnly dde} -setup { +test winDde-6.5 {DDE remote servername collision} -constraints {stdio win dde} -setup { set name child-6.5 set child [createChildProcess $name] } -body { @@ -241,7 +241,7 @@ test winDde-6.5 {DDE remote servername collision} -constraints {stdio pcOnly dde dde execute TclEval $name {set done 1} update } -result "child-6.5 #2" -test winDde-6.6 {DDE remote servername collision force} -constraints {stdio pcOnly dde} -setup { +test winDde-6.6 {DDE remote servername collision force} -constraints {stdio win dde} -setup { set name child-6.6 set child [createChildProcess $name] } -body { @@ -253,7 +253,7 @@ test winDde-6.6 {DDE remote servername collision force} -constraints {stdio pcOn # ------------------------------------------------------------------------- -test winDde-7.1 {Load DDE in slave interpreter } -constraints {pcOnly dde} -setup { +test winDde-7.1 {Load DDE in slave interpreter } -constraints {win dde} -setup { interp create slave } -body { slave eval [list load $lib dde] @@ -261,7 +261,7 @@ test winDde-7.1 {Load DDE in slave interpreter } -constraints {pcOnly dde} -setu } -cleanup { interp delete slave } -result {dde-interp-7.1} -test winDde-7.2 {DDE slave cleanup} -constraints {pcOnly dde} -setup { +test winDde-7.2 {DDE slave cleanup} -constraints {win dde} -setup { interp create slave slave eval [list load $lib dde] slave eval [list dde servername -- dde-interp-7.5] @@ -274,7 +274,7 @@ test winDde-7.2 {DDE slave cleanup} -constraints {pcOnly dde} -setup { set s } } -result {} -test winDde-7.3 {DDE present in slave interp} -constraints {pcOnly dde} -setup { +test winDde-7.3 {DDE present in slave interp} -constraints {win dde} -setup { interp create slave slave eval [list load $lib dde] slave eval [list dde servername -- dde-interp-7.3] @@ -283,7 +283,7 @@ test winDde-7.3 {DDE present in slave interp} -constraints {pcOnly dde} -setup { } -cleanup { interp delete slave } -result {{TclEval dde-interp-7.3}} -test winDde-7.4 {interp name collision with -force} -constraints {pcOnly dde} -setup { +test winDde-7.4 {interp name collision with -force} -constraints {win dde} -setup { interp create slave slave eval [list load $lib dde] slave eval [list dde servername -- dde-interp-7.4] @@ -292,7 +292,7 @@ test winDde-7.4 {interp name collision with -force} -constraints {pcOnly dde} -s } -cleanup { interp delete slave } -result {dde-interp-7.4} -test winDde-7.5 {interp name collision without -force} -constraints {pcOnly dde} -setup { +test winDde-7.5 {interp name collision without -force} -constraints {win dde} -setup { interp create slave slave eval [list load $lib dde] slave eval [list dde servername -- dde-interp-7.5] @@ -304,7 +304,7 @@ test winDde-7.5 {interp name collision without -force} -constraints {pcOnly dde} # ------------------------------------------------------------------------- -test winDde-8.1 {Safe DDE load} -constraints {pcOnly dde} -setup { +test winDde-8.1 {Safe DDE load} -constraints {win dde} -setup { interp create -safe slave slave invokehidden load $lib dde } -body { @@ -312,20 +312,20 @@ test winDde-8.1 {Safe DDE load} -constraints {pcOnly dde} -setup { } -cleanup { interp delete slave } -result {1 {invalid command name "dde"}} -test winDde-8.2 {Safe DDE set servername} -constraints {pcOnly dde} -setup { +test winDde-8.2 {Safe DDE set servername} -constraints {win dde} -setup { interp create -safe slave slave invokehidden load $lib dde } -body { slave invokehidden dde servername slave } -cleanup {interp delete slave} -result {slave} -test winDde-8.3 {Safe DDE check handler required for eval} -constraints {pcOnly dde} -setup { +test winDde-8.3 {Safe DDE check handler required for eval} -constraints {win dde} -setup { interp create -safe slave slave invokehidden load $lib dde slave invokehidden dde servername slave } -body { catch {dde eval slave set a 1} msg } -cleanup {interp delete slave} -result {1} -test winDde-8.4 {Safe DDE check that execute is denied} -constraints {pcOnly dde} -setup { +test winDde-8.4 {Safe DDE check that execute is denied} -constraints {win dde} -setup { interp create -safe slave slave invokehidden load $lib dde slave invokehidden dde servername slave @@ -336,7 +336,7 @@ test winDde-8.4 {Safe DDE check that execute is denied} -constraints {pcOnly dde slave eval set a } msg] $msg } -cleanup {interp delete slave} -result {0 1} -test winDde-8.5 {Safe DDE check that request is denied} -constraints {pcOnly dde} -setup { +test winDde-8.5 {Safe DDE check that request is denied} -constraints {win dde} -setup { interp create -safe slave slave invokehidden load $lib dde slave invokehidden dde servername slave @@ -346,14 +346,14 @@ test winDde-8.5 {Safe DDE check that request is denied} -constraints {pcOnly dde } -cleanup { interp delete slave } -result {1 {remote server cannot handle this command}} -test winDde-8.6 {Safe DDE assign handler procedure} -constraints {pcOnly dde} -setup { +test winDde-8.6 {Safe DDE assign handler procedure} -constraints {win dde} -setup { interp create -safe slave slave invokehidden load $lib dde slave eval {proc DDEACCEPT {cmd} {set ::DDECMD $cmd}} } -body { slave invokehidden dde servername -handler DDEACCEPT slave } -cleanup {interp delete slave} -result slave -test winDde-8.7 {Safe DDE check simple command} -constraints {pcOnly dde} -setup { +test winDde-8.7 {Safe DDE check simple command} -constraints {win dde} -setup { interp create -safe slave slave invokehidden load $lib dde slave eval {proc DDEACCEPT {cmd} {set ::DDECMD $cmd}} @@ -363,7 +363,7 @@ test winDde-8.7 {Safe DDE check simple command} -constraints {pcOnly dde} -setup dde eval slave set x 1 } msg] $msg } -cleanup {interp delete slave} -result {0 {set x 1}} -test winDde-8.8 {Safe DDE check non-list command} -constraints {pcOnly dde} -setup { +test winDde-8.8 {Safe DDE check non-list command} -constraints {win dde} -setup { interp create -safe slave slave invokehidden load $lib dde slave eval {proc DDEACCEPT {cmd} {set ::DDECMD $cmd}} @@ -375,7 +375,7 @@ test winDde-8.8 {Safe DDE check non-list command} -constraints {pcOnly dde} -set string compare [slave eval set DDECMD] $s } msg] $msg } -cleanup {interp delete slave} -result {0 0} -test winDde-8.9 {Safe DDE check command evaluation} -constraints {pcOnly dde} -setup { +test winDde-8.9 {Safe DDE check command evaluation} -constraints {win dde} -setup { interp create -safe slave slave invokehidden load $lib dde slave eval {proc DDEACCEPT {cmd} {set ::DDECMD [uplevel \#0 $cmd]}} @@ -386,7 +386,7 @@ test winDde-8.9 {Safe DDE check command evaluation} -constraints {pcOnly dde} -s slave eval set x } msg] $msg } -cleanup {interp delete slave} -result {0 1} -test winDde-8.10 {Safe DDE check command evaluation (2)} -constraints {pcOnly dde} -setup { +test winDde-8.10 {Safe DDE check command evaluation (2)} -constraints {win dde} -setup { interp create -safe slave slave invokehidden load $lib dde slave eval {proc DDEACCEPT {cmd} {set ::DDECMD [uplevel \#0 $cmd]}} @@ -397,7 +397,7 @@ test winDde-8.10 {Safe DDE check command evaluation (2)} -constraints {pcOnly dd slave eval set x } msg] $msg } -cleanup {interp delete slave} -result {0 1} -test winDde-8.11 {Safe DDE check command evaluation (3)} -constraints {pcOnly dde} -setup { +test winDde-8.11 {Safe DDE check command evaluation (3)} -constraints {win dde} -setup { interp create -safe slave slave invokehidden load $lib dde slave eval {proc DDEACCEPT {cmd} {set ::DDECMD [uplevel \#0 $cmd]}} @@ -411,7 +411,7 @@ test winDde-8.11 {Safe DDE check command evaluation (3)} -constraints {pcOnly dd # ------------------------------------------------------------------------- -test winDde-9.1 {External safe DDE check string passing} -constraints {pcOnly dde stdio} -setup { +test winDde-9.1 {External safe DDE check string passing} -constraints {win dde stdio} -setup { set name child-9.1 set child [createChildProcess $name Handler1] file copy -force script1.tcl dde-script.tcl @@ -426,7 +426,7 @@ test winDde-9.1 {External safe DDE check string passing} -constraints {pcOnly dd update file delete -force -- dde-script.tcl } -result {0 {set x 1}} -test winDde-9.2 {External safe DDE check command evaluation} -constraints {pcOnly dde stdio} -setup { +test winDde-9.2 {External safe DDE check command evaluation} -constraints {win dde stdio} -setup { set name child-9.2 set child [createChildProcess $name Handler2] file copy -force script1.tcl dde-script.tcl @@ -441,7 +441,7 @@ test winDde-9.2 {External safe DDE check command evaluation} -constraints {pcOnl update file delete -force -- dde-script.tcl } -result {0 1} -test winDde-9.3 {External safe DDE check prefixed arguments} -constraints {pcOnly dde stdio} -setup { +test winDde-9.3 {External safe DDE check prefixed arguments} -constraints {win dde stdio} -setup { set name child-9.3 set child [createChildProcess $name [list Handler3 ARG]] file copy -force script1.tcl dde-script.tcl 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)} diff --git a/tests/winFile.test b/tests/winFile.test index e09292d..1bfddff 100644 --- a/tests/winFile.test +++ b/tests/winFile.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: winFile.test,v 1.13 2004/05/19 13:29:02 dkf Exp $ +# RCS: @(#) $Id: winFile.test,v 1.14 2004/06/23 15:36:59 dkf Exp $ if {[catch {package require tcltest 2.0.2}]} { puts stderr "Skipping tests in [info script]. tcltest 2.0.2 required." @@ -28,15 +28,15 @@ if {[info commands ::testvolumetype] == ""} { } } -test winFile-1.1 {TclpGetUserHome} {pcOnly} { +test winFile-1.1 {TclpGetUserHome} {win} { list [catch {glob ~nosuchuser} msg] $msg } {1 {user "nosuchuser" doesn't exist}} -test winFile-1.2 {TclpGetUserHome} {pcOnly nt nonPortable} { +test winFile-1.2 {TclpGetUserHome} {win nt nonPortable} { # The administrator account should always exist. catch {glob ~administrator} } {0} -test winFile-1.3 {TclpGetUserHome} {pcOnly 95} { +test winFile-1.3 {TclpGetUserHome} {win 95} { # Find some user in system.ini and then see if they have a home. set f [open $::env(windir)/system.ini] @@ -55,24 +55,24 @@ test winFile-1.3 {TclpGetUserHome} {pcOnly 95} { close $f set x } {0} -test winFile-1.4 {TclpGetUserHome} {pcOnly nt nonPortable} { +test winFile-1.4 {TclpGetUserHome} {win nt nonPortable} { catch {glob ~stanton@workgroup} } {0} -test winFile-2.1 {TclpMatchFiles: case sensitivity} {pcOnly} { +test winFile-2.1 {TclpMatchFiles: case sensitivity} {win} { makeFile {} GlobCapS set result [list [glob -nocomplain GlobC*] [glob -nocomplain globc*]] removeFile GlobCapS set result } {GlobCapS GlobCapS} -test winFile-2.2 {TclpMatchFiles: case sensitivity} {pcOnly} { +test winFile-2.2 {TclpMatchFiles: case sensitivity} {win} { makeFile {} globlower set result [list [glob -nocomplain globl*] [glob -nocomplain gLOBl*]] removeFile globlower set result } {globlower globlower} -test winFile-3.1 {file system} {pcOnly} { +test winFile-3.1 {file system} {win} { set res "volume types ok" foreach vol [file volumes] { # Have to catch in case there is a removable drive (CDROM, floppy) @@ -160,7 +160,7 @@ close [open $fname w] test winFile-4.0 { Enhanced NTFS user/group permissions: test no acccess } -constraints { - notNTFS pcOnly nt + win nt notNTFS } -setup { set owner [getuser $fname] set user $::env(USERDOMAIN)\\$::env(USERNAME) @@ -175,7 +175,7 @@ test winFile-4.0 { test winFile-4.1 { Enhanced NTFS user/group permissions: test readable only } -constraints { - notNTFS pcOnly nt + win nt notNTFS } -setup { set user $::env(USERDOMAIN)\\$::env(USERNAME) } -body { @@ -186,7 +186,7 @@ test winFile-4.1 { test winFile-4.2 { Enhanced NTFS user/group permissions: test writable only } -constraints { - notNTFS pcOnly nt + win nt notNTFS } -setup { set user $::env(USERDOMAIN)\\$::env(USERNAME) } -body { @@ -198,7 +198,7 @@ test winFile-4.2 { test winFile-4.3 { Enhanced NTFS user/group permissions: test read+write } -constraints { - notNTFS pcOnly nt + win nt notNTFS } -setup { set user $::env(USERDOMAIN)\\$::env(USERNAME) } -body { @@ -211,7 +211,7 @@ test winFile-4.3 { test winFile-4.4 { Enhanced NTFS user/group permissions: test full access } -constraints { - notNTFS pcOnly nt + win nt notNTFS } -setup { set user $::env(USERDOMAIN)\\$::env(USERNAME) } -body { diff --git a/tests/winNotify.test b/tests/winNotify.test index 723866e..09ddc1c 100644 --- a/tests/winNotify.test +++ b/tests/winNotify.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: winNotify.test,v 1.9 2004/05/19 20:15:32 dkf Exp $ +# RCS: @(#) $Id: winNotify.test,v 1.10 2004/06/23 15:36:59 dkf Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest @@ -21,13 +21,13 @@ testConstraint testeventloop [expr {[info commands testeventloop] != {}}] # There is no explicit test for InitNotifier or NotifierExitHandler -test winNotify-1.1 {Tcl_SetTimer: positive timeout} {pcOnly} { +test winNotify-1.1 {Tcl_SetTimer: positive timeout} {win} { set done 0 after 1000 { set done 1 } vwait done set done } 1 -test winNotify-1.2 {Tcl_SetTimer: positive timeout, message pending} {pcOnly} { +test winNotify-1.2 {Tcl_SetTimer: positive timeout, message pending} {win} { set x 0 set y 1 set a1 [after 0 { incr y }] @@ -36,7 +36,7 @@ test winNotify-1.2 {Tcl_SetTimer: positive timeout, message pending} {pcOnly} { vwait x list $x $y } {1 1} -test winNotify-1.3 {Tcl_SetTimer: cancelling positive timeout} {pcOnly} { +test winNotify-1.3 {Tcl_SetTimer: cancelling positive timeout} {win} { set x 0 set y 1 set id [after 10000 { incr y }] @@ -45,7 +45,7 @@ test winNotify-1.3 {Tcl_SetTimer: cancelling positive timeout} {pcOnly} { after cancel $id list $x $y } {1 1} -test winNotify-1.4 {Tcl_SetTimer: null timeout, message pending} {pcOnly} { +test winNotify-1.4 {Tcl_SetTimer: null timeout, message pending} {win} { set x 0 set y 1 after 0 { incr x } @@ -54,14 +54,14 @@ test winNotify-1.4 {Tcl_SetTimer: null timeout, message pending} {pcOnly} { list $x $y } {1 2} -test winNotify-2.1 {Tcl_ResetIdleTimer} {pcOnly} { +test winNotify-2.1 {Tcl_ResetIdleTimer} {win} { set x 0 update after idle { incr x } vwait x set x } 1 -test winNotify-2.2 {Tcl_ResetIdleTimer: message pending} {pcOnly} { +test winNotify-2.2 {Tcl_ResetIdleTimer: message pending} {win} { set x 0 set y 1 update @@ -71,7 +71,7 @@ test winNotify-2.2 {Tcl_ResetIdleTimer: message pending} {pcOnly} { list $x $y } {1 2} -test winNotify-3.1 {NotifierProc: non-modal normal timer} {pcOnly testeventloop} { +test winNotify-3.1 {NotifierProc: non-modal normal timer} {win testeventloop} { update set x 0 foreach i [after info] { @@ -81,7 +81,7 @@ test winNotify-3.1 {NotifierProc: non-modal normal timer} {pcOnly testeventloop} testeventloop wait set x } 1 -test winNotify-3.2 {NotifierProc: non-modal normal timer, rescheduled} {pcOnly testeventloop} { +test winNotify-3.2 {NotifierProc: non-modal normal timer, rescheduled} {win testeventloop} { update set x 0 foreach i [after info] { @@ -91,7 +91,7 @@ test winNotify-3.2 {NotifierProc: non-modal normal timer, rescheduled} {pcOnly t testeventloop wait set x } 2 -test winNotify-3.3 {NotifierProc: modal normal timer} {pcOnly} { +test winNotify-3.3 {NotifierProc: modal normal timer} {win} { update set x 0 foreach i [after info] { @@ -101,7 +101,7 @@ test winNotify-3.3 {NotifierProc: modal normal timer} {pcOnly} { vwait x set x } 1 -test winNotify-3.4 {NotifierProc: modal normal timer, rescheduled} {pcOnly} { +test winNotify-3.4 {NotifierProc: modal normal timer, rescheduled} {win} { update set x 0 foreach i [after info] { @@ -112,7 +112,7 @@ test winNotify-3.4 {NotifierProc: modal normal timer, rescheduled} {pcOnly} { vwait x list $x $y } {1 1} -test winNotify-3.5 {NotifierProc: non-modal idle timer} {pcOnly testeventloop} { +test winNotify-3.5 {NotifierProc: non-modal idle timer} {win testeventloop} { update set x 0 foreach i [after info] { @@ -122,7 +122,7 @@ test winNotify-3.5 {NotifierProc: non-modal idle timer} {pcOnly testeventloop} { testeventloop wait set x } 1 -test winNotify-3.6 {NotifierProc: non-modal idle timer, rescheduled} {pcOnly testeventloop} { +test winNotify-3.6 {NotifierProc: non-modal idle timer, rescheduled} {win testeventloop} { update set x 0 foreach i [after info] { @@ -132,7 +132,7 @@ test winNotify-3.6 {NotifierProc: non-modal idle timer, rescheduled} {pcOnly tes testeventloop wait set x } 2 -test winNotify-3.7 {NotifierProc: modal idle timer} {pcOnly} { +test winNotify-3.7 {NotifierProc: modal idle timer} {win} { update set x 0 foreach i [after info] { @@ -142,7 +142,7 @@ test winNotify-3.7 {NotifierProc: modal idle timer} {pcOnly} { vwait x set x } 1 -test winNotify-3.8 {NotifierProc: modal idle timer, rescheduled} {pcOnly} { +test winNotify-3.8 {NotifierProc: modal idle timer, rescheduled} {win} { update set x 0 foreach i [after info] { diff --git a/tests/winPipe.test b/tests/winPipe.test index c41e39b..c27f9dc 100644 --- a/tests/winPipe.test +++ b/tests/winPipe.test @@ -12,7 +12,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: winPipe.test,v 1.29 2004/06/02 22:12:58 davygrvy Exp $ +# RCS: @(#) $Id: winPipe.test,v 1.30 2004/06/23 15:36:59 dkf Exp $ package require tcltest namespace import -force ::tcltest::* @@ -65,90 +65,90 @@ set path(more) [makeFile { set path(stdout) [makeFile {} stdout] set path(stderr) [makeFile {} stderr] -test winpipe-1.1 {32 bit comprehensive tests: from little file} {pcOnly exec cat32} { +test winpipe-1.1 {32 bit comprehensive tests: from little file} {win exec cat32} { exec $cat32 < $path(little) > $path(stdout) 2> $path(stderr) list [contents $path(stdout)] [contents $path(stderr)] } {little stderr32} -test winpipe-1.2 {32 bit comprehensive tests: from big file} {pcOnly exec cat32} { +test winpipe-1.2 {32 bit comprehensive tests: from big file} {win exec cat32} { exec $cat32 < $path(big) > $path(stdout) 2> $path(stderr) list [contents $path(stdout)] [contents $path(stderr)] } "{$big} stderr32" -test winpipe-1.3 {32 bit comprehensive tests: a little from pipe} {pcOnly nt exec cat32} { +test winpipe-1.3 {32 bit comprehensive tests: a little from pipe} {win nt exec cat32} { exec [interpreter] more < little | $cat32 > $path(stdout) 2> $path(stderr) list [contents $path(stdout)] [contents $path(stderr)] } {little stderr32} -test winpipe-1.4 {32 bit comprehensive tests: a lot from pipe} {pcOnly nt exec cat32} { +test winpipe-1.4 {32 bit comprehensive tests: a lot from pipe} {win nt exec cat32} { exec [interpreter] more < big | $cat32 > $path(stdout) 2> $path(stderr) list [contents $path(stdout)] [contents $path(stderr)] } "{$big} stderr32" -test winpipe-1.5 {32 bit comprehensive tests: a lot from pipe} {pcOnly 95 exec cat32} { +test winpipe-1.5 {32 bit comprehensive tests: a lot from pipe} {win 95 exec cat32} { exec command /c type big |& $cat32 > $path(stdout) 2> $path(stderr) list [contents $path(stdout)] [contents $path(stderr)] } "{$big} stderr32" test winpipe-1.6 {32 bit comprehensive tests: from console} \ - {pcOnly cat32 AllocConsole} { + {win cat32 AllocConsole} { # would block waiting for human input } {} -test winpipe-1.7 {32 bit comprehensive tests: from NUL} {pcOnly exec cat32} { +test winpipe-1.7 {32 bit comprehensive tests: from NUL} {win exec cat32} { exec $cat32 < nul > $path(stdout) 2> $path(stderr) list [contents $path(stdout)] [contents $path(stderr)] } {{} stderr32} -test winpipe-1.8 {32 bit comprehensive tests: from socket} {pcOnly cat32} { +test winpipe-1.8 {32 bit comprehensive tests: from socket} {win cat32} { # doesn't work } {} test winpipe-1.9 {32 bit comprehensive tests: from nowhere} \ - {pcOnly exec cat32 .console} { + {win exec cat32 .console} { exec $cat32 > $path(stdout) 2> $path(stderr) list [contents $path(stdout)] [contents $path(stderr)] } {{} stderr32} test winpipe-1.10 {32 bit comprehensive tests: from file handle} \ - {pcOnly exec cat32} { + {win exec cat32} { set f [open $path(little) r] exec $cat32 <@$f > $path(stdout) 2> $path(stderr) close $f list [contents $path(stdout)] [contents $path(stderr)] } {little stderr32} test winpipe-1.11 {32 bit comprehensive tests: read from application} \ - {pcOnly exec cat32} { + {win exec cat32} { set f [open "|[list $cat32] < $path(little)" r] gets $f line catch {close $f} msg list $line $msg } {little stderr32} test winpipe-1.12 {32 bit comprehensive tests: a little to file} \ - {pcOnly exec cat32} { + {win exec cat32} { exec $cat32 < $path(little) > $path(stdout) 2> $path(stderr) list [contents $path(stdout)] [contents $path(stderr)] } {little stderr32} test winpipe-1.13 {32 bit comprehensive tests: a lot to file} \ - {pcOnly exec cat32} { + {win exec cat32} { exec $cat32 < $path(big) > $path(stdout) 2> $path(stderr) list [contents $path(stdout)] [contents $path(stderr)] } "{$big} stderr32" test winpipe-1.14 {32 bit comprehensive tests: a little to pipe} \ - {pcOnly exec stdio cat32} { + {win exec stdio cat32} { exec $cat32 < $path(little) | [interpreter] $path(more) > $path(stdout) 2> $path(stderr) list [contents $path(stdout)] [contents $path(stderr)] } {little stderr32} test winpipe-1.15 {32 bit comprehensive tests: a lot to pipe} \ - {pcOnly exec stdio cat32} { + {win exec stdio cat32} { exec $cat32 < $path(big) | [interpreter] $path(more) > $path(stdout) 2> $path(stderr) list [contents $path(stdout)] [contents $path(stderr)] } "{$big} stderr32" -test winpipe-1.16 {32 bit comprehensive tests: to console} {pcOnly exec cat32} { +test winpipe-1.16 {32 bit comprehensive tests: to console} {win exec cat32} { catch {exec $cat32 << "You should see this\n" >@stdout} msg set msg } stderr32 -test winpipe-1.17 {32 bit comprehensive tests: to NUL} {pcOnly exec cat32} { +test winpipe-1.17 {32 bit comprehensive tests: to NUL} {win exec cat32} { # some apps hang when sending a large amount to NUL. $cat32 isn't one. catch {exec $cat32 < $path(big) > nul} msg set msg } stderr32 test winpipe-1.18 {32 bit comprehensive tests: to nowhere} \ - {pcOnly exec cat32 .console} { + {win exec cat32 .console} { exec $cat32 < $path(big) >&@stdout } {} -test winpipe-1.19 {32 bit comprehensive tests: to file handle} {pcOnly exec cat32} { +test winpipe-1.19 {32 bit comprehensive tests: to file handle} {win exec cat32} { set f1 [open $path(stdout) w] set f2 [open $path(stderr) w] exec $cat32 < $path(little) >@$f1 2>@$f2 @@ -157,14 +157,14 @@ test winpipe-1.19 {32 bit comprehensive tests: to file handle} {pcOnly exec cat3 list [contents $path(stdout)] [contents $path(stderr)] } {little stderr32} test winpipe-1.20 {32 bit comprehensive tests: write to application} \ - {pcOnly exec cat32} { + {win exec cat32} { set f [open |[list $cat32 >$path(stdout)] w] puts -nonewline $f "foo" catch {close $f} msg list [contents $path(stdout)] $msg } {foo stderr32} test winpipe-1.21 {32 bit comprehensive tests: read/write application} \ - {pcOnly exec cat32} { + {win exec cat32} { set f [open "|[list $cat32]" r+] puts $f $big puts $f \032 @@ -173,13 +173,13 @@ test winpipe-1.21 {32 bit comprehensive tests: read/write application} \ catch {close $f} set r } "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb" -test winpipe-1.22 {Checking command.com for Win95/98 hanging} {pcOnly 95 exec} { +test winpipe-1.22 {Checking command.com for Win95/98 hanging} {win 95 exec} { exec command.com /c dir /b set result 1 } 1 file delete more -test winpipe-4.1 {Tcl_WaitPid} {pcOnly nt exec cat32} { +test winpipe-4.1 {Tcl_WaitPid} {win nt exec cat32} { proc readResults {f} { global x result if { [eof $f] } { @@ -199,28 +199,28 @@ test winpipe-4.1 {Tcl_WaitPid} {pcOnly nt exec cat32} { vwait x list $result $x [contents $path(stderr)] } "{$big} 1 stderr32" -test winpipe-4.2 {Tcl_WaitPid: return of exception codes, SIGFPE} {pcOnly exec} { +test winpipe-4.2 {Tcl_WaitPid: return of exception codes, SIGFPE} {win exec} { set f [open "|[tcltest::interpreter]" w+] set pid [pid $f] puts $f "testexcept float_underflow" set status [catch {close $f}] list $status [expr {$pid == [lindex $::errorCode 1]}] [lindex $::errorCode 2] } {1 1 SIGFPE} -test winpipe-4.3 {Tcl_WaitPid: return of exception codes, SIGSEGV} {pcOnly exec} { +test winpipe-4.3 {Tcl_WaitPid: return of exception codes, SIGSEGV} {win exec} { set f [open "|[tcltest::interpreter]" w+] set pid [pid $f] puts $f "testexcept access_violation" set status [catch {close $f}] list $status [expr {$pid == [lindex $::errorCode 1]}] [lindex $::errorCode 2] } {1 1 SIGSEGV} -test winpipe-4.4 {Tcl_WaitPid: return of exception codes, SIGILL} {pcOnly exec} { +test winpipe-4.4 {Tcl_WaitPid: return of exception codes, SIGILL} {win exec} { set f [open "|[tcltest::interpreter]" w+] set pid [pid $f] puts $f "testexcept illegal_instruction" set status [catch {close $f}] list $status [expr {$pid == [lindex $::errorCode 1]}] [lindex $::errorCode 2] } {1 1 SIGILL} -test winpipe-4.5 {Tcl_WaitPid: return of exception codes, SIGINT} {pcOnly exec} { +test winpipe-4.5 {Tcl_WaitPid: return of exception codes, SIGINT} {win exec} { set f [open "|[tcltest::interpreter]" w+] set pid [pid $f] puts $f "testexcept ctrl+c" @@ -237,7 +237,7 @@ catch {set env_temp $env(TEMP)} set env(TMP) c:/ set env(TEMP) c:/ -test winpipe-5.1 {TclpCreateTempFile: cleanup temp files} {pcOnly exec} { +test winpipe-5.1 {TclpCreateTempFile: cleanup temp files} {win exec} { set x {} set existing [glob -nocomplain c:/tcl*.tmp] exec [interpreter] < nothing @@ -248,7 +248,7 @@ test winpipe-5.1 {TclpCreateTempFile: cleanup temp files} {pcOnly exec} { } set x } {} -test winpipe-5.2 {TclpCreateTempFile: TMP and TEMP not defined} {pcOnly exec} { +test winpipe-5.2 {TclpCreateTempFile: TMP and TEMP not defined} {win exec} { set tmp $env(TMP) set temp $env(TEMP) unset env(TMP) @@ -259,7 +259,7 @@ test winpipe-5.2 {TclpCreateTempFile: TMP and TEMP not defined} {pcOnly exec} { set x {} } {} test winpipe-5.3 {TclpCreateTempFile: TMP specifies non-existent directory} \ - {pcOnly exec } { + {win exec } { set tmp $env(TMP) set env(TMP) snarky exec [interpreter] < nothing @@ -267,7 +267,7 @@ test winpipe-5.3 {TclpCreateTempFile: TMP specifies non-existent directory} \ set x {} } {} test winpipe-5.4 {TclpCreateTempFile: TEMP specifies non-existent directory} \ - {pcOnly exec} { + {win exec} { set tmp $env(TMP) set temp $env(TEMP) unset env(TMP) @@ -279,7 +279,7 @@ test winpipe-5.4 {TclpCreateTempFile: TEMP specifies non-existent directory} \ } {} test winpipe-6.1 {PipeSetupProc & PipeCheckProc: read threads} \ - {pcOnly exec cat32} { + {win exec cat32} { set f [open "|[list $cat32]" r+] fconfigure $f -blocking 0 fileevent $f writable { set x writable } @@ -300,7 +300,7 @@ test winpipe-6.1 {PipeSetupProc & PipeCheckProc: read threads} \ } {writable timeout readable {foobar } timeout 1 stderr32} test winpipe-6.2 {PipeSetupProc & PipeCheckProc: write threads} \ - {pcOnly exec cat32} { + {win exec cat32} { set f [open "|[list $cat32]" r+] fconfigure $f -blocking 0 fileevent $f writable { set x writable } @@ -320,122 +320,121 @@ set path(echoArgs.tcl) [makeFile { ### validate the raw output of BuildCommandLine(). ### -test winpipe-7.1 {BuildCommandLine: null arguments} {pcOnly exec} { +test winpipe-7.1 {BuildCommandLine: null arguments} {win exec} { exec $env(COMSPEC) /c echo foo "" bar } {foo "" bar} -test winpipe-7.2 {BuildCommandLine: null arguments} {pcOnly exec} { +test winpipe-7.2 {BuildCommandLine: null arguments} {win exec} { exec $env(COMSPEC) /c echo foo {} bar } {foo "" bar} -test winpipe-7.3 {BuildCommandLine: dbl quote quoting #1} {pcOnly exec} { +test winpipe-7.3 {BuildCommandLine: dbl quote quoting #1} {win exec} { exec $env(COMSPEC) /c echo foo {"} bar } {foo \" bar} -test winpipe-7.4 {BuildCommandLine: dbl quote quoting #2} {pcOnly exec} { +test winpipe-7.4 {BuildCommandLine: dbl quote quoting #2} {win exec} { exec $env(COMSPEC) /c echo foo {""} bar } {foo \"\" bar} -test winpipe-7.5 {BuildCommandLine: dbl quote quoting #3} {pcOnly exec} { +test winpipe-7.5 {BuildCommandLine: dbl quote quoting #3} {win exec} { exec $env(COMSPEC) /c echo foo {" } bar } {foo "\" " bar} -test winpipe-7.6 {BuildCommandLine: dbl quote quoting #4} {pcOnly exec} { +test winpipe-7.6 {BuildCommandLine: dbl quote quoting #4} {win exec} { exec $env(COMSPEC) /c echo foo {a="b"} bar } {foo a=\"b\" bar} -test winpipe-7.7 {BuildCommandLine: dbl quote quoting #5} {pcOnly exec} { +test winpipe-7.7 {BuildCommandLine: dbl quote quoting #5} {win exec} { exec $env(COMSPEC) /c echo foo {a = "b"} bar } {foo "a = \"b\"" bar} -test winpipe-7.8 {BuildCommandLine: dbl quote quoting #6} {pcOnly exec} { +test winpipe-7.8 {BuildCommandLine: dbl quote quoting #6} {win exec} { exec $env(COMSPEC) /c echo {"hello"} {""hello""} {"""hello"""} {"\"hello\""} {he llo} {he " llo} } {\"hello\" \"\"hello\"\" \"\"\"hello\"\"\" \"\\\"hello\\\"\" "he llo" "he \" llo"} -test winpipe-7.9 {BuildCommandLine: N backslashes followed a quote rule #1} {pcOnly exec} { +test winpipe-7.9 {BuildCommandLine: N backslashes followed a quote rule #1} {win exec} { exec $env(COMSPEC) /c echo foo \\ bar } {foo \ bar} -test winpipe-7.10 {BuildCommandLine: N backslashes followed a quote rule #2} {pcOnly exec} { +test winpipe-7.10 {BuildCommandLine: N backslashes followed a quote rule #2} {win exec} { exec $env(COMSPEC) /c echo foo \\\\ bar } {foo \\ bar} -test winpipe-7.11 {BuildCommandLine: N backslashes followed a quote rule #3} {pcOnly exec} { +test winpipe-7.11 {BuildCommandLine: N backslashes followed a quote rule #3} {win exec} { exec $env(COMSPEC) /c echo foo \\\ \\ bar } {foo "\ \\" bar} -test winpipe-7.12 {BuildCommandLine: N backslashes followed a quote rule #4} {pcOnly exec} { +test winpipe-7.12 {BuildCommandLine: N backslashes followed a quote rule #4} {win exec} { exec $env(COMSPEC) /c echo foo \\\ \\\\ bar } {foo "\ \\\\" bar} -test winpipe-7.13 {BuildCommandLine: N backslashes followed a quote rule #5} {pcOnly exec} { +test winpipe-7.13 {BuildCommandLine: N backslashes followed a quote rule #5} {win exec} { exec $env(COMSPEC) /c echo foo \\\ \\\\\\ bar } {foo "\ \\\\\\" bar} -test winpipe-7.14 {BuildCommandLine: N backslashes followed a quote rule #6} {pcOnly exec} { +test winpipe-7.14 {BuildCommandLine: N backslashes followed a quote rule #6} {win exec} { exec $env(COMSPEC) /c echo foo \\\ \\\" bar } {foo "\ \\\"" bar} -test winpipe-7.15 {BuildCommandLine: N backslashes followed a quote rule #7} {pcOnly exec} { +test winpipe-7.15 {BuildCommandLine: N backslashes followed a quote rule #7} {win exec} { exec $env(COMSPEC) /c echo foo \\\ \\\\\" bar } {foo "\ \\\\\"" bar} -test winpipe-7.16 {BuildCommandLine: N backslashes followed a quote rule #8} {pcOnly exec} { +test winpipe-7.16 {BuildCommandLine: N backslashes followed a quote rule #8} {win exec} { exec $env(COMSPEC) /c echo foo \\\ \\\\\\\" bar } {foo "\ \\\\\\\"" bar} -test winpipe-7.17 {BuildCommandLine: special chars #4} {pcOnly exec} { +test winpipe-7.17 {BuildCommandLine: special chars #4} {win exec} { exec $env(COMSPEC) /c echo foo \{ bar } "foo \{ bar" -test winpipe-7.18 {BuildCommandLine: special chars #5} {pcOnly exec} { +test winpipe-7.18 {BuildCommandLine: special chars #5} {win exec} { exec $env(COMSPEC) /c echo foo \} bar } "foo \} bar" ### validate the pass-thru from BuildCommandLine() to the crt's parse_cmdline(). ### -test winpipe-8.1 {BuildCommandLine/parse_cmdline pass-thru: null arguments} {pcOnly exec} { +test winpipe-8.1 {BuildCommandLine/parse_cmdline pass-thru: null arguments} {win exec} { exec [interpreter] $path(echoArgs.tcl) foo "" bar } [list $path(echoArgs.tcl) [list foo {} bar]] -test winpipe-8.2 {BuildCommandLine/parse_cmdline pass-thru: null arguments} {pcOnly exec} { +test winpipe-8.2 {BuildCommandLine/parse_cmdline pass-thru: null arguments} {win exec} { exec [interpreter] $path(echoArgs.tcl) foo {} bar } [list $path(echoArgs.tcl) [list foo {} bar]] -test winpipe-8.3 {BuildCommandLine/parse_cmdline pass-thru: dbl quote quoting #1} {pcOnly exec} { +test winpipe-8.3 {BuildCommandLine/parse_cmdline pass-thru: dbl quote quoting #1} {win exec} { exec [interpreter] $path(echoArgs.tcl) foo {"} bar } [list $path(echoArgs.tcl) [list foo {"} bar]] -test winpipe-8.4 {BuildCommandLine/parse_cmdline pass-thru: dbl quote quoting #2} {pcOnly exec} { +test winpipe-8.4 {BuildCommandLine/parse_cmdline pass-thru: dbl quote quoting #2} {win exec} { exec [interpreter] $path(echoArgs.tcl) foo {""} bar } [list $path(echoArgs.tcl) [list foo {""} bar]] -test winpipe-8.5 {BuildCommandLine/parse_cmdline pass-thru: dbl quote quoting #3} {pcOnly exec} { +test winpipe-8.5 {BuildCommandLine/parse_cmdline pass-thru: dbl quote quoting #3} {win exec} { exec [interpreter] $path(echoArgs.tcl) foo {" } bar } [list $path(echoArgs.tcl) [list foo {" } bar]] -test winpipe-8.6 {BuildCommandLine/parse_cmdline pass-thru: dbl quote quoting #4} {pcOnly exec} { +test winpipe-8.6 {BuildCommandLine/parse_cmdline pass-thru: dbl quote quoting #4} {win exec} { exec [interpreter] $path(echoArgs.tcl) foo {a="b"} bar } [list $path(echoArgs.tcl) [list foo {a="b"} bar]] -test winpipe-8.7 {BuildCommandLine/parse_cmdline pass-thru: dbl quote quoting #5} {pcOnly exec} { +test winpipe-8.7 {BuildCommandLine/parse_cmdline pass-thru: dbl quote quoting #5} {win exec} { exec [interpreter] $path(echoArgs.tcl) foo {a = "b"} bar } [list $path(echoArgs.tcl) [list foo {a = "b"} bar]] -test winpipe-8.8 {BuildCommandLine/parse_cmdline pass-thru: dbl quote quoting #6} {pcOnly exec} { +test winpipe-8.8 {BuildCommandLine/parse_cmdline pass-thru: dbl quote quoting #6} {win exec} { exec [interpreter] $path(echoArgs.tcl) {"hello"} {""hello""} {"""hello"""} {"\"hello\""} {he llo} {he " llo} } [list $path(echoArgs.tcl) [list {"hello"} {""hello""} {"""hello"""} {"\"hello\""} {he llo} {he " llo}]] -test winpipe-8.9 {BuildCommandLine/parse_cmdline pass-thru: N backslashes followed a quote rule #1} {pcOnly exec} { +test winpipe-8.9 {BuildCommandLine/parse_cmdline pass-thru: N backslashes followed a quote rule #1} {win exec} { exec [interpreter] $path(echoArgs.tcl) foo \\ bar } [list $path(echoArgs.tcl) [list foo \\ bar]] -test winpipe-8.10 {BuildCommandLine/parse_cmdline pass-thru: N backslashes followed a quote rule #2} {pcOnly exec} { +test winpipe-8.10 {BuildCommandLine/parse_cmdline pass-thru: N backslashes followed a quote rule #2} {win exec} { exec [interpreter] $path(echoArgs.tcl) foo \\\\ bar } [list $path(echoArgs.tcl) [list foo \\\\ bar]] -test winpipe-8.11 {BuildCommandLine/parse_cmdline pass-thru: N backslashes followed a quote rule #3} {pcOnly exec} { +test winpipe-8.11 {BuildCommandLine/parse_cmdline pass-thru: N backslashes followed a quote rule #3} {win exec} { exec [interpreter] $path(echoArgs.tcl) foo \\\ \\ bar } [list $path(echoArgs.tcl) [list foo \\\ \\ bar]] -test winpipe-8.12 {BuildCommandLine/parse_cmdline pass-thru: N backslashes followed a quote rule #4} {pcOnly exec} { +test winpipe-8.12 {BuildCommandLine/parse_cmdline pass-thru: N backslashes followed a quote rule #4} {win exec} { exec [interpreter] $path(echoArgs.tcl) foo \\\ \\\\ bar } [list $path(echoArgs.tcl) [list foo \\\ \\\\ bar]] -test winpipe-8.13 {BuildCommandLine/parse_cmdline pass-thru: N backslashes followed a quote rule #5} {pcOnly exec} { +test winpipe-8.13 {BuildCommandLine/parse_cmdline pass-thru: N backslashes followed a quote rule #5} {win exec} { exec [interpreter] $path(echoArgs.tcl) foo \\\ \\\\\\ bar } [list $path(echoArgs.tcl) [list foo \\\ \\\\\\ bar]] -test winpipe-8.14 {BuildCommandLine/parse_cmdline pass-thru: N backslashes followed a quote rule #6} {pcOnly exec} { +test winpipe-8.14 {BuildCommandLine/parse_cmdline pass-thru: N backslashes followed a quote rule #6} {win exec} { exec [interpreter] $path(echoArgs.tcl) foo \\\ \\\" bar } [list $path(echoArgs.tcl) [list foo \\\ \\\" bar]] -test winpipe-8.15 {BuildCommandLine/parse_cmdline pass-thru: N backslashes followed a quote rule #7} {pcOnly exec} { +test winpipe-8.15 {BuildCommandLine/parse_cmdline pass-thru: N backslashes followed a quote rule #7} {win exec} { exec [interpreter] $path(echoArgs.tcl) foo \\\ \\\\\" bar } [list $path(echoArgs.tcl) [list foo \\\ \\\\\" bar]] -test winpipe-8.16 {BuildCommandLine/parse_cmdline pass-thru: N backslashes followed a quote rule #8} {pcOnly exec} { +test winpipe-8.16 {BuildCommandLine/parse_cmdline pass-thru: N backslashes followed a quote rule #8} {win exec} { exec [interpreter] $path(echoArgs.tcl) foo \\\ \\\\\\\" bar } [list $path(echoArgs.tcl) [list foo \\\ \\\\\\\" bar]] -test winpipe-8.17 {BuildCommandLine/parse_cmdline pass-thru: special chars #1} {pcOnly exec} { +test winpipe-8.17 {BuildCommandLine/parse_cmdline pass-thru: special chars #1} {win exec} { exec [interpreter] $path(echoArgs.tcl) foo \{ bar } [list $path(echoArgs.tcl) [list foo \{ bar]] -test winpipe-8.18 {BuildCommandLine/parse_cmdline pass-thru: special chars #2} {pcOnly exec} { +test winpipe-8.18 {BuildCommandLine/parse_cmdline pass-thru: special chars #2} {win exec} { exec [interpreter] $path(echoArgs.tcl) foo \} bar } [list $path(echoArgs.tcl) [list foo \} bar]] -test winpipe-8.19 {ensure parse_cmdline isn't doing wildcard replacement} {pcOnly exec} { +test winpipe-8.19 {ensure parse_cmdline isn't doing wildcard replacement} {win exec} { exec [interpreter] $path(echoArgs.tcl) foo * makefile.?c bar } [list $path(echoArgs.tcl) [list foo * makefile.?c bar]] - # restore old values for env(TMP) and env(TEMP) if {[catch {set env(TMP) $env_tmp}]} { diff --git a/tests/winTime.test b/tests/winTime.test index 787fb58..00cf4d8 100644 --- a/tests/winTime.test +++ b/tests/winTime.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: winTime.test,v 1.9 2003/04/12 19:08:55 kennykb Exp $ +# RCS: @(#) $Id: winTime.test,v 1.10 2004/06/23 15:36:59 dkf Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest @@ -22,13 +22,13 @@ testConstraint testwinclock [llength [info commands testwinclock]] # The next two tests will crash on Windows if the check for negative # clock values is not done properly. -test winTime-1.1 {TclpGetDate} {pcOnly} { +test winTime-1.1 {TclpGetDate} {win} { set ::env(TZ) JST-9 set result [clock format -1 -format %Y] unset ::env(TZ) set result } {1970} -test winTime-1.2 {TclpGetDate} {pcOnly} { +test winTime-1.2 {TclpGetDate} {win} { set ::env(TZ) PST8 set result [clock format 1 -format %Y] unset ::env(TZ) |