From 8d94e515a1b9ff2044435c145b20d5bb66c24b43 Mon Sep 17 00:00:00 2001 From: dgp Date: Tue, 21 Jun 2011 16:45:17 +0000 Subject: tcltest 2.3.3 fixes: * Use [package ifneeded] so slave gets exactly same tcltest version as master * Use [configure] command instead of legacy ::argv magic to pass tcltest configuration options to slave interp. Test files using the new [loadIntoSlaveInterpreter] command updated to declare their need for tcltest 2.3.3 as minimum acceptable release. --- library/tcltest/tcltest.tcl | 4 ++-- tests/init.test | 2 +- tests/pkg.test | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/library/tcltest/tcltest.tcl b/library/tcltest/tcltest.tcl index ad61f9c..af809f6 100644 --- a/library/tcltest/tcltest.tcl +++ b/library/tcltest/tcltest.tcl @@ -797,8 +797,8 @@ namespace eval tcltest { proc loadIntoSlaveInterpreter {slave args} { variable Version - interp eval $slave [list set ::argv $args] - interp eval $slave [list package require tcltest $Version] + interp eval $slave [package ifneeded tcltest $Version] + interp eval $slave "tcltest::configure {*}{$args}" interp alias $slave ::tcltest::ReportToMaster \ {} ::tcltest::ReportedFromSlave } diff --git a/tests/init.test b/tests/init.test index aaa4c4f..0af94ea 100644 --- a/tests/init.test +++ b/tests/init.test @@ -11,7 +11,7 @@ # of this file, and for a DISCLAIMER OF ALL WARRANTIES. if {[lsearch [namespace children] ::tcltest] == -1} { - package require tcltest 2 + package require tcltest 2.3.3 namespace import -force ::tcltest::* } diff --git a/tests/pkg.test b/tests/pkg.test index 62075f3..a073d25 100644 --- a/tests/pkg.test +++ b/tests/pkg.test @@ -12,7 +12,7 @@ # of this file, and for a DISCLAIMER OF ALL WARRANTIES. if {[lsearch [namespace children] ::tcltest] == -1} { - package require tcltest 2 + package require tcltest 2.3.3 namespace import -force ::tcltest::* } -- cgit v0.12