diff options
| author | dgp <dgp@users.sourceforge.net> | 2022-11-18 15:30:50 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2022-11-18 15:30:50 (GMT) |
| commit | 2eebbe64abc8293f4317729610f6587d06aeed0d (patch) | |
| tree | 6d1ab9ccda299920a10ba35cc31d109ee4500f2e | |
| parent | b669079dd69a6f5b0027edd74d53f8b0390769f3 (diff) | |
| parent | 2a1443e0e07d217161b094cf6e550f63ef2cab54 (diff) | |
| download | tcl-2eebbe64abc8293f4317729610f6587d06aeed0d.zip tcl-2eebbe64abc8293f4317729610f6587d06aeed0d.tar.gz tcl-2eebbe64abc8293f4317729610f6587d06aeed0d.tar.bz2 | |
merge 8.6
| -rw-r--r-- | tests/chanio.test | 1 | ||||
| -rw-r--r-- | tests/env.test | 4 | ||||
| -rw-r--r-- | tests/exec.test | 4 | ||||
| -rw-r--r-- | tests/io.test | 1 | ||||
| -rw-r--r-- | tests/ioCmd.test | 2 | ||||
| -rw-r--r-- | tests/thread.test | 3 |
6 files changed, 3 insertions, 12 deletions
diff --git a/tests/chanio.test b/tests/chanio.test index 7d9c3e5..4193f54 100644 --- a/tests/chanio.test +++ b/tests/chanio.test @@ -39,7 +39,6 @@ namespace eval ::tcl::test::io { package require -exact tcl::test [info patchlevel] set ::tcltestlib [info loaded {} Tcltest] } - package require tcltests testConstraint testbytestring [llength [info commands testbytestring]] testConstraint testchannel [llength [info commands testchannel]] diff --git a/tests/env.test b/tests/env.test index 3de7312..4fb4a86 100644 --- a/tests/env.test +++ b/tests/env.test @@ -16,10 +16,6 @@ if {"::tcltest" ni [namespace children]} { namespace import -force ::tcltest::* } -loadTestedCommands -catch [list package require -exact tcl::test [info patchlevel]] -package require tcltests - # [exec] is required here to see the actual environment received by child # processes. proc getenv {} { diff --git a/tests/exec.test b/tests/exec.test index 6e4718a..f8bfbde 100644 --- a/tests/exec.test +++ b/tests/exec.test @@ -19,10 +19,6 @@ if {"::tcltest" ni [namespace children]} { namespace import -force ::tcltest::* } -loadTestedCommands -catch [list package require -exact tcl::test [info patchlevel]] -package require tcltests - # All tests require the "exec" command. # Skip them if exec is not defined. testConstraint exec [llength [info commands exec]] diff --git a/tests/io.test b/tests/io.test index a80e94e..21a2bf8 100644 --- a/tests/io.test +++ b/tests/io.test @@ -34,7 +34,6 @@ namespace eval ::tcl::test::io { package require -exact tcl::test [info patchlevel] set ::tcltestlib [info loaded {} Tcltest] } - package require tcltests testConstraint testbytestring [llength [info commands testbytestring]] testConstraint testchannel [llength [info commands testchannel]] diff --git a/tests/ioCmd.test b/tests/ioCmd.test index 6fc4de0..e4584ba 100644 --- a/tests/ioCmd.test +++ b/tests/ioCmd.test @@ -21,8 +21,6 @@ if {"::tcltest" ni [namespace children]} { ::tcltest::loadTestedCommands catch [list package require -exact tcl::test [info patchlevel]] -package require tcltests - # Custom constraints used in this file testConstraint testchannel [llength [info commands testchannel]] diff --git a/tests/thread.test b/tests/thread.test index 16e60ed..22c1a4f 100644 --- a/tests/thread.test +++ b/tests/thread.test @@ -19,6 +19,9 @@ if {"::tcltest" ni [namespace children]} { # when thread::release is used, -wait is passed in order allow the thread to # be fully finalized, which avoids valgrind "still reachable" reports. +package require tcltest 2.5 +namespace import ::tcltest::* + ::tcltest::loadTestedCommands catch [list package require -exact tcl::test [info patchlevel]] package require tcltests |