[Bug 3549770] Multiple test failures running tcltest outside build tree

4 files changed, 23 insertions, 17 deletions

diff --git a/ChangeLog b/ChangeLog
index 4918ede..14cb0b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-07-28  Jan Nijtmans  <nijtmans@users.sf.net>
+
+	* tests/clock.test:    [Bug 3549770] Multiple test failures running tcltest
+	* tests/registry.test: outside build tree
+	* tests/winDde.test:
+
 2012-07-27  Jan Nijtmans  <nijtmans@users.sf.net>
 
 	* generic/tclUniData.c:   Support Unicode 6.2 (Add Turkish lira sign)
diff --git a/tests/clock.test b/tests/clock.test
index 42675a5..5db6273 100644
--- a/tests/clock.test
+++ b/tests/clock.test
@@ -17,8 +17,8 @@ if {[lsearch [namespace children] ::tcltest] == -1} {
 }
 
 if {[testConstraint win]} {
-    if {[catch {package require registry 1.1}] 
-	&& [catch {load {} Registry}]
+    if {[catch {load {} Registry}]
+	&& [catch {package require registry}] 
 	&& [catch {
 	    ::tcltest::loadTestedCommands
 	    load $::reglib Registry
diff --git a/tests/registry.test b/tests/registry.test
index f90f602..cda914f 100644
--- a/tests/registry.test
+++ b/tests/registry.test
@@ -17,13 +17,12 @@ if {[lsearch [namespace children] ::tcltest] == -1} {
 
 testConstraint reg 0
 if {[testConstraint win]} {
-    catch {
-	# Is the registry extension already static to this shell?
-	if [catch {load {} Registry; set ::reglib {}}] {
-	    # try the location given to use on the commandline to tcltest
+    if {![catch {load {} Registry}]
+	|| ![catch {package require registry}] 
+	|| ![catch {
 	    ::tcltest::loadTestedCommands
 	    load $::reglib Registry
-	}
+	}]} {
 	testConstraint reg 1
     }
 }
@@ -460,7 +459,7 @@ test registry-6.20 {GetValue: values with Unicode strings with embedded nulls} {
     registry delete HKEY_CURRENT_USER\\TclFoobar
     set result
 } "foo ba r baz"
-test registry-6.21 {GetValue: very long value names and values} {pcOnly} {
+test registry-6.21 {GetValue: very long value names and values} {pcOnly reg} {
     registry set HKEY_CURRENT_USER\\TclFoobar [string repeat k 199] [string repeat x 199] multi_sz
     set result [registry get HKEY_CURRENT_USER\\TclFoobar [string repeat k 199]]
     registry delete HKEY_CURRENT_USER\\TclFoobar
diff --git a/tests/winDde.test b/tests/winDde.test
index 9c777c3..b684394 100644
--- a/tests/winDde.test
+++ b/tests/winDde.test
@@ -15,17 +15,16 @@ if {[lsearch [namespace children] ::tcltest] == -1} {
     namespace import -force ::tcltest::*
 }
 
+testConstraint dde 0
 if {[testConstraint win]} {
-    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
+    if {![catch {load {} Dde; set ::ddelib {}}]
+	|| ![catch {
+	    package require dde
+	    set ::ddelib [lindex [package ifneeded dde 1.3.3] 1]}] 
+	|| ![catch {
 	    ::tcltest::loadTestedCommands
-	    load $::ddelib Dde
-	}
+	    load $::ddelib Dde}]} {
 	testConstraint dde 1
-    }] {
-	testConstraint dde 0
     }
 }
 
@@ -41,8 +40,10 @@ proc createChildProcess { ddeServerName {handler {}}} {
 
     set f [open $::scriptName w+]
     puts $f [list set ddeServerName $ddeServerName]
-    if {$::ddelib != ""} {
+    if {[info exists ::ddelib]} {
 	puts $f [list load $::ddelib Dde]
+    } else {
+	puts $f [list package require dde]
     }
     puts $f {
         # DDE child server -