diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-11-18 19:18:12 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-11-18 19:18:12 (GMT) |
| commit | 2e64df785756872bec28b2f9fc73acd8b3a17ce5 (patch) | |
| tree | 52d7507d9e8d0c05dc7d7ce2aec162da9c5be574 | |
| parent | ae54d4dd89479887660e43d8189196e5ec1a2fa2 (diff) | |
| parent | 78bce4ec934a2cce5174e894d2c845df212f71b9 (diff) | |
| download | tcl-2e64df785756872bec28b2f9fc73acd8b3a17ce5.zip tcl-2e64df785756872bec28b2f9fc73acd8b3a17ce5.tar.gz tcl-2e64df785756872bec28b2f9fc73acd8b3a17ce5.tar.bz2 | |
Merge 8.7
| -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 41c0ef7..691a2c0 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 bbf7985..b36b049 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 5ecfcac..e8ba6b2 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 04c9cd2..d5a39c7 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 9e53201..0e6a8e9 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 |