From f6d9c470d0aae768623bf1afc328443ba2372287 Mon Sep 17 00:00:00 2001 From: jenn Date: Fri, 27 Aug 1999 21:45:17 +0000 Subject: * tests/env.test: * tests/exec.test: * tests/io.test: * tests/event.test: * tests/tcltest.test: Added 'exit' calls to scripts that the tests themselves write, and removed accidental checkin of knownBugThreaded constraints for Solaris and Linux. --- tests/env.test | 3 ++- tests/event.test | 14 +++----------- tests/exec.test | 7 ++++++- tests/io.test | 32 ++++++++++++-------------------- tests/tcltest.test | 9 +++++---- 5 files changed, 28 insertions(+), 37 deletions(-) diff --git a/tests/env.test b/tests/env.test index 44fc6aa..e65b844 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.9 1999/07/08 19:44:43 rjohnson Exp $ +# RCS: @(#) $Id: env.test,v 1.10 1999/08/27 21:45:17 jenn Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest @@ -84,6 +84,7 @@ puts $f { foreach p $names { puts "$p=$env($p)" } + exit } close $f diff --git a/tests/event.test b/tests/event.test index d237a86..1366704 100644 --- a/tests/event.test +++ b/tests/event.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: event.test,v 1.9 1999/08/27 01:17:05 jenn Exp $ +# RCS: @(#) $Id: event.test,v 1.10 1999/08/27 21:45:17 jenn Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest @@ -23,15 +23,7 @@ set ::tcltest::testConstraints(testexithandler) \ set ::tcltest::testConstraints(testfilewait) \ [expr {[info commands testfilewait] != {}}] -set ::tcltest::testConstraints(knownBugThreadedLinux) [expr \ - {($tcl_platform(os) != "Linux") \ - && ([info commands testthread] != {})}] - -set ::tcltest::testConstraints(knownBugThreadedSolaris) [expr \ - {($tcl_platform(os) != "SunOS") \ - && ([info commands testthread] != {})}] - -test event-1.1 {Tcl_CreateFileHandler, reading} {testfilehandler knownBugThreadedLinux knownBugThreadedSolaris} { +test event-1.1 {Tcl_CreateFileHandler, reading} {testfilehandler} { testfilehandler close testfilehandler create 0 readable off testfilehandler clear 0 @@ -375,7 +367,7 @@ test event-11.3 {Tcl_VwaitCmd procedure} { set x 1 list [catch {vwait x(1)} msg] $msg } {1 {can't trace "x(1)": variable isn't array}} -test event-11.4 {Tcl_VwaitCmd procedure} {knownBugThreadedLinux} { +test event-11.4 {Tcl_VwaitCmd procedure} {} { foreach i [after info] { after cancel $i } diff --git a/tests/exec.test b/tests/exec.test index 653066d..b142e9b 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.5 1999/07/01 17:36:17 jenn Exp $ +# RCS: @(#) $Id: exec.test,v 1.6 1999/08/27 21:45:17 jenn Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest @@ -29,6 +29,7 @@ puts $f { puts -nonewline " $str" } puts {} + exit } close $f @@ -51,6 +52,7 @@ puts $f { close $f } } + exit } close $f @@ -61,6 +63,7 @@ puts $f { set words [regsub -all "\[^ \t\n]+" $data {} dummy] set chars [string length $data] puts [format "%8.d%8.d%8.d" $lines $words $chars] + exit } close $f @@ -85,12 +88,14 @@ puts $f { } lappend newcmd $arg } + exit } close $f set f [open sleep w] puts $f { after [expr $argv*1000] + exit } close $f diff --git a/tests/io.test b/tests/io.test index 1e82b26..65e1662 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.11 1999/08/27 01:17:05 jenn Exp $ +# RCS: @(#) $Id: io.test,v 1.12 1999/08/27 21:45:17 jenn Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest @@ -27,14 +27,6 @@ if {"[info commands testchannel]" != "testchannel"} { ::tcltest::saveState -set ::tcltest::testConstraints(knownBugThreadedLinux) [expr \ - {($tcl_platform(os) != "Linux") \ - && ([info commands testthread] != {})}] - -set ::tcltest::testConstraints(knownBugThreadedSolaris) [expr \ - {($tcl_platform(os) != "SunOS") \ - && ([info commands testthread] != {})}] - removeFile test1 removeFile pipe @@ -1033,7 +1025,7 @@ test io-6.55 {Tcl_GetsObj: overconverted} { close $f set x } [list 8 "there\u4e00ok" 11 "\u4e01more bytes" 4 "here"] -test io-6.56 {Tcl_GetsObj: incomplete lines should disable file events} {stdio knownBugThreadedSolaris knownBugThreadedLinux} { +test io-6.56 {Tcl_GetsObj: incomplete lines should disable file events} {stdio} { update set f [open "|[list $::tcltest::tcltest cat]" w+] fconfigure $f -buffering none @@ -1427,7 +1419,7 @@ test io-12.5 {ReadChars: fileevents on partial characters} {stdio} { set x } "{} timeout {} timeout \u7266 {} eof 0 {}" -test io-13.1 {TranslateInputEOL: cr mode} {knownBugThreadedLinux} { +test io-13.1 {TranslateInputEOL: cr mode} {} { set f [open test1 w] fconfigure $f -translation lf puts -nonewline $f "abcd\rdef\r" @@ -1488,7 +1480,7 @@ test io-13.5 {TranslateInputEOL: crlf mode: naked lf} { close $f set x } "abcd\ndef\nfgh" -test io-13.6 {TranslateInputEOL: auto mode: saw cr in last segment} {stdio knownBugThreadedSolaris knownBugThreadedLinux} { +test io-13.6 {TranslateInputEOL: auto mode: saw cr in last segment} {stdio} { # (chanPtr->flags & INPUT_SAW_CR) # This test may fail on slower machines. @@ -2048,7 +2040,7 @@ test io-27.5 {FlushChannel, implicit flush when buffer fills and on close} \ set l } {0 60 72} test io-27.6 {FlushChannel, async flushing, async close} \ - {stdio asyncPipeClose knownBugThreadedLinux} { + {stdio asyncPipeClose } { removeFile pipe removeFile output set f [open pipe w] @@ -5463,7 +5455,7 @@ test io-45.3 {DeleteFileEvent, cleanup on close} { if {[info commands testfevent] == "testfevent"} { - test io-46.1 {Tcl event loop vs multiple interpreters} {knownBugThreadedLinux} { + test io-46.1 {Tcl event loop vs multiple interpreters} {} { testfevent create testfevent cmd { set f [open foo r] @@ -6118,7 +6110,7 @@ test io-49.5 {testing crlf reading, leftover cr disgorgment} { set l } [list 7 a\rb\rc 7 {} 7 1] -test io-50.1 {testing handler deletion} {knownBugThreadedSolaris knownBugThreadedLinux} { +test io-50.1 {testing handler deletion} {} { removeFile test1 set f [open test1 w] close $f @@ -6134,7 +6126,7 @@ test io-50.1 {testing handler deletion} {knownBugThreadedSolaris knownBugThreade close $f set z } called -test io-50.2 {testing handler deletion with multiple handlers} {knownBugThreadedSolaris knownBugThreadedLinux} { +test io-50.2 {testing handler deletion with multiple handlers} {} { removeFile test1 set f [open test1 w] close $f @@ -6152,7 +6144,7 @@ test io-50.2 {testing handler deletion with multiple handlers} {knownBugThreaded string compare [string tolower $z] \ [list [list called delhandler $f 0] [list called delhandler $f 1]] } 0 -test io-50.3 {testing handler deletion with multiple handlers} {knownBugThreadedSolaris knownBugThreadedLinux} { +test io-50.3 {testing handler deletion with multiple handlers} {} { removeFile test1 set f [open test1 w] close $f @@ -6178,7 +6170,7 @@ test io-50.3 {testing handler deletion with multiple handlers} {knownBugThreaded [list [list delhandler $f 0 called] \ [list delhandler $f 0 deleted myself]] } 0 -test io-50.4 {testing handler deletion vs reentrant calls} {knownBugThreadedSolaris knownBugThreadedLinux} { +test io-50.4 {testing handler deletion vs reentrant calls} {} { removeFile test1 set f [open test1 w] close $f @@ -6202,7 +6194,7 @@ test io-50.4 {testing handler deletion vs reentrant calls} {knownBugThreadedSola string compare [string tolower $z] \ {{delrecursive calling recursive} {delrecursive deleting recursive}} } 0 -test io-50.5 {testing handler deletion vs reentrant calls} {knownBugThreadedSolaris knownBugThreadedLinux} { +test io-50.5 {testing handler deletion vs reentrant calls} {} { removeFile test1 set f [open test1 w] close $f @@ -6235,7 +6227,7 @@ test io-50.5 {testing handler deletion vs reentrant calls} {knownBugThreadedSola [list {del calling recursive} {del deleted notcalled} \ {del deleted myself} {del after update}] } 0 -test io-50.6 {testing handler deletion vs reentrant calls} {knownBugThreadedSolaris knownBugThreadedLinux} { +test io-50.6 {testing handler deletion vs reentrant calls} {} { removeFile test1 set f [open test1 w] close $f diff --git a/tests/tcltest.test b/tests/tcltest.test index b87b830..13df747 100755 --- a/tests/tcltest.test +++ b/tests/tcltest.test @@ -10,7 +10,7 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: tcltest.test,v 1.7 1999/08/27 01:17:06 jenn Exp $ +# RCS: @(#) $Id: tcltest.test,v 1.8 1999/08/27 21:45:18 jenn Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest @@ -29,7 +29,7 @@ makeFile { test c-1.0 {test c} {knownBug} { } {} ::tcltest::cleanupTests - return + exit } test.tcl # test -help @@ -158,6 +158,7 @@ makeFile { ::tcltest::PrintError "a really really long string containing a \ \"Really/Long/Path/that/contains/no/spaces/and/is/longer/than/eighty/characters/to/see/what/happens\"" ::tcltest::PrintError "Problem renaming file: error renaming \"Z:/ws/tcl8.2/win32-ix86/tests/core\" to \"Z:/ws/tcl8.2/win32-ix86/tests/movecore-core\"" + exit } printerror.tcl # -outfile, -errfile @@ -217,7 +218,7 @@ makeFile { package require tcltest namespace import ::tcltest::* makeFile {} a.tmp - return + exit } a.tcl makeFile {} thisdirectoryisafile @@ -327,7 +328,7 @@ makeFile { package require tcltest namespace import ::tcltest::* puts "=$::tcltest::parameters=" - return + exit } args.tcl # -args -- cgit v0.12