diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/defs.tcl | 26 | ||||
| -rw-r--r-- | tests/unixMenu.test | 15 |
2 files changed, 13 insertions, 28 deletions
diff --git a/tests/defs.tcl b/tests/defs.tcl index c582b52..245ec6a 100644 --- a/tests/defs.tcl +++ b/tests/defs.tcl @@ -11,7 +11,7 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: defs.tcl,v 1.4 1999/04/20 19:20:03 hershey Exp $ +# RCS: @(#) $Id: defs.tcl,v 1.5 1999/05/25 20:40:54 stanton Exp $ # Initialize wish shell @@ -980,22 +980,20 @@ if {[info exists tk_version]} { cleanupbg } - # The following code segment cannot be run on Windows in Tk8.1b2 - # This bug is logged as a pipe bug (bugID 1495). + # The following code segment cannot be run on Windows prior + # to Tk 8.1b3 due to a channel I/O bug. global tcl_platform - if {$tcl_platform(platform) != "windows"} { - set ::tcltest::fd [open "|[list $::tcltest::tktest -geometry +0+0 -name tktest] $args" r+] - puts $::tcltest::fd "puts foo; flush stdout" - flush $::tcltest::fd - if {[gets $::tcltest::fd data] < 0} { - error "unexpected EOF from \"$::tcltest::tktest\"" - } - if {[string compare $data foo]} { - error "unexpected output from background process \"$data\"" - } - fileevent $::tcltest::fd readable bgReady + set ::tcltest::fd [open "|[list $::tcltest::tktest -geometry +0+0 -name tktest] $args" r+] + puts $::tcltest::fd "puts foo; flush stdout" + flush $::tcltest::fd + if {[gets $::tcltest::fd data] < 0} { + error "unexpected EOF from \"$::tcltest::tktest\"" + } + if {[string compare $data foo]} { + error "unexpected output from background process \"$data\"" } + fileevent $::tcltest::fd readable bgReady } # Send a command to the background process, catching errors and diff --git a/tests/unixMenu.test b/tests/unixMenu.test index ebc833b..30bb07a 100644 --- a/tests/unixMenu.test +++ b/tests/unixMenu.test @@ -7,7 +7,7 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: unixMenu.test,v 1.3 1999/04/16 01:51:42 stanton Exp $ +# RCS: @(#) $Id: unixMenu.test,v 1.4 1999/05/25 20:40:54 stanton Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { source [file join [pwd] [file dirname [info script]] defs.tcl] @@ -972,16 +972,3 @@ test unixMenu-26.1 {TkpMenuInit - nothing to do} {} {} deleteWindows ::tcltest::cleanupTests return - - - - - - - - - - - - - |