From a96389c630f566cd60a1801a00ce9cbd49de6246 Mon Sep 17 00:00:00 2001 From: dgp Date: Sat, 22 Jun 2002 04:19:46 +0000 Subject: * Corrections to tcltest and the Tcl test suite so that a test with options -constraints knownBug -limitConstraints 1 only tests the knownBug tests. Mostly involves replacing direct access to the testConstraints array with calls to the testConstraint command (which requires tcltest version 2). --- ChangeLog | 25 +++++++++++++++++++++++++ library/tcltest/tcltest.tcl | 5 ++++- tests/basic.test | 12 ++++++------ tests/cmdInfo.test | 8 ++++---- tests/compile.test | 8 ++++---- tests/encoding.test | 8 ++++---- tests/env.test | 6 +++--- tests/event.test | 10 +++++----- tests/exec.test | 6 +++--- tests/execute.test | 8 ++++---- tests/fCmd.test | 10 +++++----- tests/format.test | 8 ++++---- tests/http.test | 3 ++- tests/httpold.test | 3 ++- tests/ioUtil.test | 10 +++++----- tests/link.test | 6 +++--- tests/load.test | 8 ++++---- tests/namespace.test | 6 +++--- tests/pkgMkIndex.test | 6 +++--- tests/reg.test | 10 +++++----- tests/result.test | 4 ++-- tests/scan.test | 7 +++---- tests/stack.test | 10 +++++----- 23 files changed, 108 insertions(+), 79 deletions(-) diff --git a/ChangeLog b/ChangeLog index e9e03dd..52e523e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,28 @@ +2002-06-22 Don Porter + + * library/tcltest/tcltest.tcl: Corrections to tcltest and the + * tests/basic.test: Tcl test suite so that a test + * tests/cmdInfo.test: with options -constraints knownBug + * tests/compile.test: -limitConstraints 1 only tests the + * tests/encoding.test: knownBug tests. Mostly involves + * tests/env.test: replacing direct access to the + * tests/event.test: testConstraints array with calls + * tests/exec.test: to the testConstraint command + * tests/execute.test: (which requires tcltest version 2) + * tests/fCmd.test: + * tests/format.test: + * tests/http.test: + * tests/httpold.test: + * tests/ioUtil.test: + * tests/link.test: + * tests/load.test: + * tests/namespace.test: + * tests/pkgMkIndex.test: + * tests/reg.test: + * tests/result.test: + * tests/scan.test: + * tests/stack.test: + 2002-06-22 Donal K. Fellows * tools/tcl.wse.in (Disk Label), unix/tcl.spec (version): diff --git a/library/tcltest/tcltest.tcl b/library/tcltest/tcltest.tcl index 96c9693..b2b020b 100644 --- a/library/tcltest/tcltest.tcl +++ b/library/tcltest/tcltest.tcl @@ -15,7 +15,7 @@ # Copyright (c) 2000 by Ajuba Solutions # All rights reserved. # -# RCS: @(#) $Id: tcltest.tcl,v 1.54 2002/06/06 20:54:03 dgp Exp $ +# RCS: @(#) $Id: tcltest.tcl,v 1.55 2002/06/22 04:19:46 dgp Exp $ # create the "tcltest" namespace for all testing variables and # procedures @@ -685,6 +685,9 @@ proc tcltest::testConstraint {constraint {value ""}} { if {[catch {expr {$value && $value}} msg]} { return -code error $msg } + if {[limitConstraints]} { + set value 0 + } set testConstraints($constraint) $value } diff --git a/tests/basic.test b/tests/basic.test index 6159abc..0d80968 100644 --- a/tests/basic.test +++ b/tests/basic.test @@ -15,21 +15,21 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: basic.test,v 1.20 2002/05/07 15:54:40 msofer Exp $ +# RCS: @(#) $Id: basic.test,v 1.21 2002/06/22 04:19:47 dgp Exp $ # if {[lsearch [namespace children] ::tcltest] == -1} { - package require tcltest + package require tcltest 2 namespace import -force ::tcltest::* } -set ::tcltest::testConstraints(testcmdtoken) \ +::tcltest::testConstraint testcmdtoken \ [llength [info commands testcmdtoken]] -set ::tcltest::testConstraints(testcmdtrace) \ +::tcltest::testConstraint testcmdtrace \ [llength [info commands testcmdtrace]] -set ::tcltest::testConstraints(testcreatecommand) \ +::tcltest::testConstraint testcreatecommand \ [llength [info commands testcreatecommand]] -set ::tcltest::testConstraints(exec) \ +::tcltest::testConstraint exec \ [llength [info commands exec]] # This variable needs to be changed when the major or minor version number for diff --git a/tests/cmdInfo.test b/tests/cmdInfo.test index a29c7ca..5f62444 100644 --- a/tests/cmdInfo.test +++ b/tests/cmdInfo.test @@ -13,16 +13,16 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: cmdInfo.test,v 1.6 2001/09/20 01:02:20 hobbs Exp $ +# RCS: @(#) $Id: cmdInfo.test,v 1.7 2002/06/22 04:19:47 dgp Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { - package require tcltest + package require tcltest 2 namespace import -force ::tcltest::* } -set ::tcltest::testConstraints(testcmdinfo) \ +::tcltest::testConstraint testcmdinfo \ [llength [info commands testcmdinfo]] -set ::tcltest::testConstraints(testcmdtoken) \ +::tcltest::testConstraint testcmdtoken \ [llength [info commands testcmdtoken]] test cmdinfo-1.1 {command procedure and clientData} {testcmdinfo} { diff --git a/tests/compile.test b/tests/compile.test index 64a72f7..0583222 100644 --- a/tests/compile.test +++ b/tests/compile.test @@ -11,10 +11,10 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: compile.test,v 1.20 2002/06/16 22:24:12 msofer Exp $ +# RCS: @(#) $Id: compile.test,v 1.21 2002/06/22 04:19:47 dgp Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { - package require tcltest + package require tcltest 2 namespace import -force ::tcltest::* } @@ -265,8 +265,8 @@ test compile-11.9 {Tcl_Append*: ensure Tcl_ResetResult is used properly} { # with TCL_MEM_DEBUG # # Special test for leak on interp delete [Bug 467523]. -set ::tcltest::testConstraints(execCommandExists) [expr {[info commands exec] != ""}] -set ::tcltest::testConstraints(memDebug) [expr {[info commands memory] != ""}] +::tcltest::testConstraint execCommandExists [expr {[info commands exec] != ""}] +::tcltest::testConstraint memDebug [expr {[info commands memory] != ""}] test compile-12.1 {testing literal leak on interp delete} {memDebug} { proc getbytes {} { diff --git a/tests/encoding.test b/tests/encoding.test index 3fb9b84..fb6f0c3 100644 --- a/tests/encoding.test +++ b/tests/encoding.test @@ -8,10 +8,10 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: encoding.test,v 1.12 2002/05/07 15:54:40 msofer Exp $ +# RCS: @(#) $Id: encoding.test,v 1.13 2002/06/22 04:19:47 dgp Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { - package require tcltest + package require tcltest 2 namespace import -force ::tcltest::* } @@ -26,9 +26,9 @@ proc fromutf {args} { # Some tests require the testencoding command -set ::tcltest::testConstraints(testencoding) \ +::tcltest::testConstraint testencoding \ [expr {[info commands testencoding] != {}}] -set ::tcltest::testConstraints(exec) \ +::tcltest::testConstraint exec \ [llength [info commands exec]] diff --git a/tests/env.test b/tests/env.test index f1e6a39..ce14fed 100644 --- a/tests/env.test +++ b/tests/env.test @@ -11,10 +11,10 @@ # 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.13 2000/04/10 17:18:58 ericm Exp $ +# RCS: @(#) $Id: env.test,v 1.14 2002/06/22 04:19:47 dgp Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { - package require tcltest + package require tcltest 2 namespace import -force ::tcltest::* } @@ -58,7 +58,7 @@ test env-1.3 {reflection of env by "array names"} { # Some tests require the "exec" command. # Skip them if exec is not defined. -set ::tcltest::testConstraints(execCommandExists) [expr {[info commands exec] != ""}] +::tcltest::testConstraint execCommandExists [expr {[info commands exec] != ""}] set f [open printenv w] puts $f { diff --git a/tests/event.test b/tests/event.test index 2afd33e..8c26fee 100644 --- a/tests/event.test +++ b/tests/event.test @@ -9,18 +9,18 @@ # 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.15 2002/01/27 11:09:23 das Exp $ +# RCS: @(#) $Id: event.test,v 1.16 2002/06/22 04:19:47 dgp Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { - package require tcltest + package require tcltest 2 namespace import -force ::tcltest::* } -set ::tcltest::testConstraints(testfilehandler) \ +::tcltest::testConstraint testfilehandler \ [expr {[info commands testfilehandler] != {}}] -set ::tcltest::testConstraints(testexithandler) \ +::tcltest::testConstraint testexithandler \ [expr {[info commands testexithandler] != {}}] -set ::tcltest::testConstraints(testfilewait) \ +::tcltest::testConstraint testfilewait \ [expr {[info commands testfilewait] != {}}] test event-1.1 {Tcl_CreateFileHandler, reading} {testfilehandler} { diff --git a/tests/exec.test b/tests/exec.test index 9ead9ce..13477c0 100644 --- a/tests/exec.test +++ b/tests/exec.test @@ -11,16 +11,16 @@ # 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.10 2002/06/17 20:05:49 andreas_kupries Exp $ +# RCS: @(#) $Id: exec.test,v 1.11 2002/06/22 04:19:47 dgp Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { - package require tcltest + package require tcltest 2 namespace import -force ::tcltest::* } # All tests require the "exec" command. # Skip them if exec is not defined. -set ::tcltest::testConstraints(execCommandExists) [expr {[info commands exec] != ""}] +::tcltest::testConstraint execCommandExists [expr {[info commands exec] != ""}] set f [open echo w] puts $f { diff --git a/tests/execute.test b/tests/execute.test index c59292a..4e6c5de 100644 --- a/tests/execute.test +++ b/tests/execute.test @@ -14,10 +14,10 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: execute.test,v 1.10 2002/02/15 14:28:50 dkf Exp $ +# RCS: @(#) $Id: execute.test,v 1.11 2002/06/22 04:19:47 dgp Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { - package require tcltest + package require tcltest 2 namespace import -force ::tcltest::* } @@ -27,13 +27,13 @@ catch {unset x} catch {unset y} catch {unset msg} -set ::tcltest::testConstraints(testobj) \ +::tcltest::testConstraint testobj \ [expr {[info commands testobj] != {} \ && [info commands testdoubleobj] != {} \ && [info commands teststringobj] != {} \ && [info commands testobj] != {}}] -set ::tcltest::testConstraints(longIs32bit) \ +::tcltest::testConstraint longIs32bit \ [expr {int(0x80000000) < 0}] # Tests for the omnibus TclExecuteByteCode function: diff --git a/tests/fCmd.test b/tests/fCmd.test index 964f31d..94db157 100644 --- a/tests/fCmd.test +++ b/tests/fCmd.test @@ -10,11 +10,11 @@ # 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.14 2002/06/21 14:22:29 vincentdarley Exp $ +# RCS: @(#) $Id: fCmd.test,v 1.15 2002/06/22 04:19:47 dgp Exp $ # if {[lsearch [namespace children] ::tcltest] == -1} { - package require tcltest + package require tcltest 2 namespace import -force ::tcltest::* } @@ -2140,14 +2140,14 @@ test fCmd-27.4 {TclFileAttrsCmd - getting one option} { # Find a group that exists on this Unix system, or else skip tests that # require Unix groups. if {$tcl_platform(platform) == "unix"} { - set ::tcltest::testConstraints(foundGroup) 0 + ::tcltest::testConstraint foundGroup 0 catch { set groupList [exec groups] set group [lindex $groupList 0] - set ::tcltest::testConstraints(foundGroup) 1 + ::tcltest::testConstraint foundGroup 1 } } else { - set ::tcltest::testConstraints(foundGroup) 1 + ::tcltest::testConstraint foundGroup 1 } test fCmd-27.5 {TclFileAttrsCmd - setting one option} {foundGroup} { diff --git a/tests/format.test b/tests/format.test index b7990b3..567bc9e 100644 --- a/tests/format.test +++ b/tests/format.test @@ -10,10 +10,10 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: format.test,v 1.10 2002/02/15 14:28:50 dkf Exp $ +# RCS: @(#) $Id: format.test,v 1.11 2002/06/22 04:19:47 dgp Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { - package require tcltest + package require tcltest 2 namespace import -force ::tcltest::* } @@ -487,9 +487,9 @@ for {set i 290} {$i < 400} {incr i} { append b "x" } -set ::tcltest::testConstraints(64bitInts) \ +::tcltest::testConstraint 64bitInts \ [expr {0x80000000 > 0}] -set ::tcltest::testConstraints(wideIntExpressions) \ +::tcltest::testConstraint wideIntExpressions \ [expr {wide(0x80000000) != int(0x80000000)}] test format-17.1 {testing %d with wide} {64bitInts wideIntExpressions} { diff --git a/tests/http.test b/tests/http.test index daf08a9..cabfaed 100644 --- a/tests/http.test +++ b/tests/http.test @@ -12,7 +12,7 @@ # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # # -# RCS: @(#) $Id: http.test,v 1.25 2001/10/12 19:44:56 hobbs Exp $ +# RCS: @(#) $Id: http.test,v 1.26 2002/06/22 04:19:47 dgp Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest @@ -27,6 +27,7 @@ if {[catch {package require http 2} version]} { catch {puts "Running http 2.* tests in slave interp"} set interp [interp create http2] $interp eval [list set http2 "running"] + $interp eval [list set argv $argv] $interp eval [list source [info script]] interp delete $interp return diff --git a/tests/httpold.test b/tests/httpold.test index 42e326b..8cdb9d8 100644 --- a/tests/httpold.test +++ b/tests/httpold.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: httpold.test,v 1.8 2000/04/10 17:18:59 ericm Exp $ +# RCS: @(#) $Id: httpold.test,v 1.9 2002/06/22 04:19:47 dgp Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest @@ -27,6 +27,7 @@ if {[catch {package require http 1.0}]} { catch {puts "Running http 1.0 tests in slave interp"} set interp [interp create httpold] $interp eval [list set httpold "running"] + $interp eval [list set argv $argv] $interp eval [list source [info script]] interp delete $interp ::tcltest::cleanupTests diff --git a/tests/ioUtil.test b/tests/ioUtil.test index c4b7889..01bd593 100644 --- a/tests/ioUtil.test +++ b/tests/ioUtil.test @@ -8,18 +8,18 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: ioUtil.test,v 1.10 2001/09/06 23:04:30 hobbs Exp $ +# RCS: @(#) $Id: ioUtil.test,v 1.11 2002/06/22 04:19:47 dgp Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { - package require tcltest + package require tcltest 2 namespace import -force ::tcltest::* } -set ::tcltest::testConstraints(testopenfilechannelproc) \ +::tcltest::testConstraint testopenfilechannelproc \ [llength [info commands testopenfilechannelproc]] -set ::tcltest::testConstraints(testaccessproc) \ +::tcltest::testConstraint testaccessproc \ [llength [info commands testaccessproc]] -set ::tcltest::testConstraints(teststatproc) \ +::tcltest::testConstraint teststatproc \ [llength [info commands teststatproc]] set unsetScript { diff --git a/tests/link.test b/tests/link.test index ae06584..765f4b9 100644 --- a/tests/link.test +++ b/tests/link.test @@ -11,14 +11,14 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: link.test,v 1.6 2002/02/15 14:28:50 dkf Exp $ +# RCS: @(#) $Id: link.test,v 1.7 2002/06/22 04:19:47 dgp Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { - package require tcltest + package require tcltest 2 namespace import -force ::tcltest::* } -set ::tcltest::testConstraints(testlink) \ +::tcltest::testConstraint testlink \ [expr {[info commands testlink] != {}}] foreach i {int real bool string} { diff --git a/tests/load.test b/tests/load.test index fcd6084..db2d073 100644 --- a/tests/load.test +++ b/tests/load.test @@ -10,10 +10,10 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: load.test,v 1.9 2002/05/10 18:47:11 dgp Exp $ +# RCS: @(#) $Id: load.test,v 1.10 2002/06/22 04:19:47 dgp Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { - package require tcltest + package require tcltest 2 namespace import -force ::tcltest::* } @@ -31,12 +31,12 @@ set ext [info sharedlibextension] set testDir [file join [file dirname [info nameofexecutable]] dltest] set x [file join $testDir pkga$ext] set dll "[file tail $x]Required" -set ::tcltest::testConstraints($dll) [file readable $x] +::tcltest::testConstraint $dll [file readable $x] # Tests also require that this DLL has not already been loaded. set loaded "[file tail $x]Loaded" set alreadyLoaded [info loaded] -set ::tcltest::testConstraints($loaded) \ +::tcltest::testConstraint $loaded \ [expr {![string match *pkga* $alreadyLoaded]}] set alreadyTotalLoaded [info loaded] diff --git a/tests/namespace.test b/tests/namespace.test index 6c2ba40..d49f0ff 100644 --- a/tests/namespace.test +++ b/tests/namespace.test @@ -11,10 +11,10 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: namespace.test,v 1.20 2001/11/29 19:38:48 msofer Exp $ +# RCS: @(#) $Id: namespace.test,v 1.21 2002/06/22 04:19:47 dgp Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { - package require tcltest + package require tcltest 2 namespace import -force ::tcltest::* } @@ -1167,7 +1167,7 @@ test namespace-41.2 {Shadowing byte-compiled commands, Bug: 231259} { set res } {New proc is called} -test namespace-41.3 {Shadowing byte-compiled commands, Bug: 231259} {knownbug} { +test namespace-41.3 {Shadowing byte-compiled commands, Bug: 231259} {knownBug} { set res {} namespace eval ns { variable b 0 diff --git a/tests/pkgMkIndex.test b/tests/pkgMkIndex.test index 79a6b52..26e78f5 100644 --- a/tests/pkgMkIndex.test +++ b/tests/pkgMkIndex.test @@ -8,10 +8,10 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: pkgMkIndex.test,v 1.19 2002/05/07 18:03:05 vincentdarley Exp $ +# RCS: @(#) $Id: pkgMkIndex.test,v 1.20 2002/06/22 04:19:47 dgp Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { - package require tcltest + package require tcltest 2 namespace import -force ::tcltest::* } @@ -332,7 +332,7 @@ test pkgMkIndex-9.1 {circular packages} { set x [file join [file dirname [info nameofexecutable]] dltest \ pkga[info sharedlibextension]] set dll "[file tail $x]Required" -set ::tcltest::testConstraints($dll) [file exists $x] +::tcltest::testConstraint $dll [file exists $x] test pkgMkIndex-10.1 {package in DLL and script} $dll { file copy -force $x $fullPkgPath diff --git a/tests/reg.test b/tests/reg.test index c10f929..f35050b 100644 --- a/tests/reg.test +++ b/tests/reg.test @@ -9,19 +9,19 @@ # # Copyright (c) 1998, 1999 Henry Spencer. All rights reserved. # -# RCS: @(#) $Id: reg.test,v 1.13 2000/04/10 17:19:03 ericm Exp $ +# RCS: @(#) $Id: reg.test,v 1.14 2002/06/22 04:19:47 dgp Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { - package require tcltest + package require tcltest 2 namespace import -force ::tcltest::* } # All tests require the testregexp command, return if this # command doesn't exist -set ::tcltest::testConstraints(testregexp) \ +::tcltest::testConstraint testregexp \ [expr {[info commands testregexp] != {}}] -set ::tcltest::testConstraints(localeRegexp) 0 +::tcltest::testConstraint localeRegexp 0 # This file uses some custom procedures, defined below, for regexp regression # testing. The name of the procedure indicates the general nature of the @@ -267,7 +267,7 @@ proc matchexpected {opts testid flags re target args} { if {[info exists regBug] && $regBug} { # This will register as a skipped test - test $prefix.[tno $testid] [desc $testid] knownBug {} {} + test $prefix.[tno $testid] [desc $testid] knownBug {format 0} {1} return } diff --git a/tests/result.test b/tests/result.test index e8418e2..f0fb9e3 100644 --- a/tests/result.test +++ b/tests/result.test @@ -13,13 +13,13 @@ # SCCS: @(#) result.test 1.4 97/12/08 15:07:49 if {[lsearch [namespace children] ::tcltest] == -1} { - package require tcltest + package require tcltest 2 namespace import -force ::tcltest::* } # Some tests require the testsaveresult command -set ::tcltest::testConstraints(testsaveresult) \ +::tcltest::testConstraint testsaveresult \ [expr {[info commands testsaveresult] != {}}] test result-1.1 {Tcl_SaveInterpResult} {testsaveresult} { diff --git a/tests/scan.test b/tests/scan.test index 2bfa49a..a86c3da 100644 --- a/tests/scan.test +++ b/tests/scan.test @@ -11,15 +11,14 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: scan.test,v 1.13 2002/02/15 14:28:50 dkf Exp $ +# RCS: @(#) $Id: scan.test,v 1.14 2002/06/22 04:19:47 dgp Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { - package require tcltest + package require tcltest 2 namespace import -force ::tcltest::* } -set ::tcltest::testConstraints(64bitInts) \ - [expr {0x80000000 > 0}] +::tcltest::testConstraint 64bitInts [expr {0x80000000 > 0}] test scan-1.1 {BuildCharSet, CharInSet} { list [scan foo {%[^o]} x] $x diff --git a/tests/stack.test b/tests/stack.test index 119d928..8d07bfb 100644 --- a/tests/stack.test +++ b/tests/stack.test @@ -9,10 +9,10 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: stack.test,v 1.13 2002/06/06 21:01:48 dgp Exp $ +# RCS: @(#) $Id: stack.test,v 1.14 2002/06/22 04:19:47 dgp Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { - package require tcltest + package require tcltest 2 namespace import -force ::tcltest::* } @@ -30,12 +30,12 @@ if {[string equal $::tcl_platform(platform) "unix"]} { may cause Tcl to\ncrash due to stack overflow before the\ recursion limit is reached.\nA minimum stacksize of 2400\ kbytes is recommended.\nSkipping infinite recursion test." - set ::tcltest::testConstraints(minStack2400) 0 + ::tcltest::testConstraint minStack2400 0 } else { - set ::tcltest::testConstraints(minStack2400) 1 + ::tcltest::testConstraint minStack2400 1 } } else { - set ::tcltest::testConstraints(minStack2400) 1 + ::tcltest::testConstraint minStack2400 1 } test stack-1.1 {maxNestingDepth reached on infinite recursion} {minStack2400} { -- cgit v0.12