summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tests/clock.test6
-rw-r--r--tests/registry.test6
-rw-r--r--tests/winDde.test17
-rw-r--r--win/Makefile.in8
-rw-r--r--win/makefile.vc8
5 files changed, 17 insertions, 28 deletions
diff --git a/tests/clock.test b/tests/clock.test
index 5db6273..fea1fc9 100644
--- a/tests/clock.test
+++ b/tests/clock.test
@@ -17,11 +17,9 @@ if {[lsearch [namespace children] ::tcltest] == -1} {
}
if {[testConstraint win]} {
- if {[catch {load {} Registry}]
- && [catch {package require registry}]
- && [catch {
+ if {[catch {
::tcltest::loadTestedCommands
- load $::reglib Registry
+ package require registry
}]} {
namespace eval ::tcl::clock {variable NoRegistry {}}
}
diff --git a/tests/registry.test b/tests/registry.test
index cda914f..cbca4fd 100644
--- a/tests/registry.test
+++ b/tests/registry.test
@@ -17,11 +17,9 @@ if {[lsearch [namespace children] ::tcltest] == -1} {
testConstraint reg 0
if {[testConstraint win]} {
- if {![catch {load {} Registry}]
- || ![catch {package require registry}]
- || ![catch {
+ if {![catch {
::tcltest::loadTestedCommands
- load $::reglib Registry
+ package require registry
}]} {
testConstraint reg 1
}
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 -
#
diff --git a/win/Makefile.in b/win/Makefile.in
index a06cc3f..8e01818 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -696,14 +696,14 @@ install-private-headers: libraries
test: binaries $(TCLTEST)
TCL_LIBRARY="$(LIBRARY_DIR)"; export TCL_LIBRARY; \
./$(TCLTEST) "$(ROOT_DIR_NATIVE)/tests/all.tcl" $(TESTFLAGS) \
- -load "set ::ddelib [file normalize ${DDE_DLL_FILE}]; \
- set ::reglib [file normalize ${REG_DLL_FILE}]" | ./$(CAT32)
+ -load "package ifneeded dde 1.3.3 [list load [file normalize ${DDE_DLL_FILE}] dde]; \
+ package ifneeded registry 1.2.2 [list load [file normalize ${REG_DLL_FILE}] registry]" | ./$(CAT32)
# Useful target to launch a built tcltest with the proper path,...
runtest: binaries $(TCLTEST)
@TCL_LIBRARY="$(LIBRARY_DIR)"; export TCL_LIBRARY; \
- ./$(TCLTEST) $(TESTFLAGS) -load "set ::ddelib [file normalize ${DDE_DLL_FILE}]; \
- set ::reglib [file normalize ${REG_DLL_FILE}]" $(SCRIPT)
+ ./$(TCLTEST) $(TESTFLAGS) -load "package ifneeded dde 1.3.3 [list load [file normalize ${DDE_DLL_FILE}] dde]; \
+ package ifneeded registry 1.2.2 [list load [file normalize ${REG_DLL_FILE}] registry]" $(SCRIPT)
# This target can be used to run tclsh from the build directory via
# `make shell SCRIPT=foo.tcl`
diff --git a/win/makefile.vc b/win/makefile.vc
index e453df1..5db8143 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -527,14 +527,14 @@ test: setup $(TCLTEST) dlls $(CAT32)
set TCL_LIBRARY=$(ROOT)/library
!if "$(OS)" == "Windows_NT" || "$(MSVCDIR)" == "IDE"
$(TCLTEST) "$(ROOT)/tests/all.tcl" $(TESTFLAGS) -loadfile <<
- set ::ddelib [file normalize $(TCLDDELIB:\=/)]
- set ::reglib [file normalize $(TCLREGLIB:\=/)]
+ package ifneeded dde 1.3.3 [list load "$(TCLDDELIB:\=/)" dde]
+ package ifneeded registry 1.2.2 [list load "$(TCLREGLIB:\=/)" registry]
<<
!else
@echo Please wait while the tests are collected...
$(TCLTEST) "$(ROOT)/tests/all.tcl" $(TESTFLAGS) -loadfile << > tests.log
- set ::ddelib [file normalize $(TCLDDELIB:\=/)]
- set ::reglib [file normalize $(TCLREGLIB:\=/)]
+ package ifneeded dde 1.3.3 "$(TCLDDELIB:\=/)" dde]
+ package ifneeded registry 1.2.2 "$(TCLREGLIB:\=/)" registry]
<<
type tests.log | more
!endif