merge trunkbug_3545363

1 files changed, 11 insertions, 12 deletions

diff --git a/tests/winDde.test b/tests/winDde.test
index 83f3598..9e0b20a 100644
--- a/tests/winDde.test
+++ b/tests/winDde.test
@@ -15,16 +15,14 @@ if {"::tcltest" ni [namespace children]} {
     namespace import -force ::tcltest::*
 }
 
-if [catch {
-    # Is the dde extension already static to this shell?
-    if [catch {load {} Dde; set ::ddelib {}}] {
-	# try the location given to use on the commandline to tcltest
-	::tcltest::loadTestedCommands
-	load $::ddelib Dde
+testConstraint dde 0
+if {[testConstraint win]} {
+    if {![catch {
+	    ::tcltest::loadTestedCommands
+	    set ::ddever [package require dde 1.4.0b1]
+	    set ::ddelib [lindex [package ifneeded dde $::ddever] 1]}]} {
+	testConstraint dde 1
     }
-    testConstraint dde 1
-}] {
-    testConstraint dde 0
 }
 
 
@@ -39,9 +37,7 @@ proc createChildProcess {ddeServerName args} {
 
     set f [open $::scriptName w+]
     puts $f [list set ddeServerName $ddeServerName]
-    if {$::ddelib != ""} {
-	puts $f [list load $::ddelib Dde]
-    }
+    puts $f [list load $::ddelib dde]
     puts $f {
         # DDE child server -
         #
@@ -105,6 +101,9 @@ proc createChildProcess {ddeServerName args} {
 }
 
 # -------------------------------------------------------------------------
+test winDde-1.0 {check if we are testing the right dll} {win dde} {
+    set ::ddever
+} {1.4.0b1}
 
 test winDde-1.1 {Settings the server's topic name} -constraints dde -body {
     list [dde servername foobar] [dde servername] [dde servername self]