diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-07-28 22:54:19 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-07-28 22:54:19 (GMT) |
| commit | a8b104c3b5ef5cf3721b20a37d48360b90f77a10 (patch) | |
| tree | 1db30d24ce737688e181c057e5a12951fd2ce441 /tests/winDde.test | |
| parent | fac7c80aed10356b5116daca1d8b8a160aa1d18d (diff) | |
| download | tcl-a8b104c3b5ef5cf3721b20a37d48360b90f77a10.zip tcl-a8b104c3b5ef5cf3721b20a37d48360b90f77a10.tar.gz tcl-a8b104c3b5ef5cf3721b20a37d48360b90f77a10.tar.bz2 | |
Bug [3549770]: Multiple test failures running tcltest outside build tree
Diffstat (limited to 'tests/winDde.test')
| -rw-r--r-- | tests/winDde.test | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/tests/winDde.test b/tests/winDde.test index b684394..f0ef56c 100644 --- a/tests/winDde.test +++ b/tests/winDde.test @@ -17,13 +17,10 @@ if {[lsearch [namespace children] ::tcltest] == -1} { testConstraint dde 0 if {[testConstraint win]} { - if {![catch {load {} Dde; set ::ddelib {}}] - || ![catch { - package require dde - set ::ddelib [lindex [package ifneeded dde 1.3.3] 1]}] - || ![catch { + if {![catch { ::tcltest::loadTestedCommands - load $::ddelib Dde}]} { + package require dde + set ::ddelib [lindex [package ifneeded dde 1.3.3] 1]}]} { testConstraint dde 1 } } @@ -35,16 +32,12 @@ if {[testConstraint win]} { set scriptName [makeFile {} script1.tcl] -proc createChildProcess { ddeServerName {handler {}}} { +proc createChildProcess {ddeServerName {handler {}}} { file delete -force $::scriptName set f [open $::scriptName w+] puts $f [list set ddeServerName $ddeServerName] - if {[info exists ::ddelib]} { - puts $f [list load $::ddelib Dde] - } else { - puts $f [list package require dde] - } + puts $f [list load $::ddelib dde] puts $f { # DDE child server - # |