diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/chanio.test | 10 | ||||
| -rw-r--r-- | tests/safe.test | 15 |
2 files changed, 13 insertions, 12 deletions
diff --git a/tests/chanio.test b/tests/chanio.test index df78461..729b436 100644 --- a/tests/chanio.test +++ b/tests/chanio.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: chanio.test,v 1.21 2008/12/19 16:01:42 dgp Exp $ +# RCS: @(#) $Id: chanio.test,v 1.22 2009/11/19 21:17:36 nijtmans Exp $ if {[catch {package require tcltest 2}]} { chan puts stderr "Skipping tests in [info script]. tcltest 2 required." @@ -1571,8 +1571,8 @@ test chan-io-14.3 {Tcl_SetStdChannel & Tcl_GetStdChannel} {exec openpipe} { out } {err }} -# This test relies on the fact that the smallest available fd is used first. -test chan-io-14.4 {Tcl_SetStdChannel & Tcl_GetStdChannel} {exec unix} { +# This test relies on the fact that stdout is used before stderr. +test chan-io-14.4 {Tcl_SetStdChannel & Tcl_GetStdChannel} {exec} { set f [open $path(test1) w] chan puts -nonewline $f { chan close stdin chan close stdout @@ -1597,8 +1597,8 @@ test chan-io-14.4 {Tcl_SetStdChannel & Tcl_GetStdChannel} {exec unix} { chan close $f2 set result } {{ chan close stdin -file1 -} {file2 +stdout +} {stderr }} catch {interp delete z} test chan-io-14.5 {Tcl_GetChannel: stdio name translation} -setup { diff --git a/tests/safe.test b/tests/safe.test index 22ef475..786cafb 100644 --- a/tests/safe.test +++ b/tests/safe.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: safe.test,v 1.26 2009/11/05 20:15:36 andreas_kupries Exp $ +# RCS: @(#) $Id: safe.test,v 1.27 2009/11/19 21:17:36 nijtmans Exp $ package require Tcl 8.5 @@ -376,34 +376,35 @@ if {[catch {package require Tcltest} msg]} { # we use the Tcltest package , which has no Safe_Init } +teststaticpkg Safepkg1 0 0 test safe-10.1 {testing statics loading} TcltestPackage { set i [safe::interpCreate] list \ - [catch {interp eval $i {load {} Tcltest}} msg] \ + [catch {interp eval $i {load {} Safepkg1}} msg] \ $msg \ [safe::interpDelete $i]; -} {1 {can't use package in a safe interpreter: no Tcltest_SafeInit procedure} {}} +} {1 {can't use package in a safe interpreter: no Safepkg1_SafeInit procedure} {}} test safe-10.2 {testing statics loading / -nostatics} TcltestPackage { set i [safe::interpCreate -nostatics] list \ - [catch {interp eval $i {load {} Tcltest}} msg] \ + [catch {interp eval $i {load {} Safepkg1}} msg] \ $msg \ [safe::interpDelete $i]; } {1 {permission denied (static package)} {}} test safe-10.3 {testing nested statics loading / no nested by default} TcltestPackage { set i [safe::interpCreate] list \ - [catch {interp eval $i {interp create x; load {} Tcltest x}} msg] \ + [catch {interp eval $i {interp create x; load {} Safepkg1 x}} msg] \ $msg \ [safe::interpDelete $i]; } {1 {permission denied (nested load)} {}} test safe-10.4 {testing nested statics loading / -nestedloadok} TcltestPackage { set i [safe::interpCreate -nestedloadok] list \ - [catch {interp eval $i {interp create x; load {} Tcltest x}} msg] \ + [catch {interp eval $i {interp create x; load {} Safepkg1 x}} msg] \ $msg \ [safe::interpDelete $i]; -} {1 {can't use package in a safe interpreter: no Tcltest_SafeInit procedure} {}} +} {1 {can't use package in a safe interpreter: no Safepkg1_SafeInit procedure} {}} test safe-11.1 {testing safe encoding} { set i [safe::interpCreate] |