From d90e8072f547d5c90ca14de82a3b9897afe7ed9a Mon Sep 17 00:00:00 2001 From: dgp Date: Sat, 30 Oct 2004 02:16:51 +0000 Subject: * library/tcltest/tcltest.tcl: Correct reaction to errors in the obsolete processCmdLineArgsHook. [Bug 1055673] * library/tcltest/pkgIndex.tcl: Bump to tcltest 2.2.7 * unix/Makefile.in: * tests/all.tcl: Update to use [tcltest::configure]. --- ChangeLog | 8 ++++++++ library/tcltest/pkgIndex.tcl | 2 +- library/tcltest/tcltest.tcl | 10 ++++++---- tests/all.tcl | 14 ++++++-------- unix/Makefile.in | 6 +++--- 5 files changed, 24 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6aa13f2..add43e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2004-10-29 Don Porter + + * library/tcltest/tcltest.tcl: Correct reaction to errors in the + obsolete processCmdLineArgsHook. [Bug 1055673] + * library/tcltest/pkgIndex.tcl: Bump to tcltest 2.2.7 + * unix/Makefile.in: + * tests/all.tcl: Update to use [tcltest::configure]. + 2004-10-29 Donal K. Fellows * library/tm.tcl (::tcl::tm::*): Use the core proc engine to diff --git a/library/tcltest/pkgIndex.tcl b/library/tcltest/pkgIndex.tcl index 6e0766e..fe594b6 100644 --- a/library/tcltest/pkgIndex.tcl +++ b/library/tcltest/pkgIndex.tcl @@ -9,4 +9,4 @@ # full path name of this file's directory. if {![package vsatisfies [package provide Tcl] 8.3]} {return} -package ifneeded tcltest 2.2.6 [list source [file join $dir tcltest.tcl]] +package ifneeded tcltest 2.2.7 [list source [file join $dir tcltest.tcl]] diff --git a/library/tcltest/tcltest.tcl b/library/tcltest/tcltest.tcl index 692f0f1..0e01828 100644 --- a/library/tcltest/tcltest.tcl +++ b/library/tcltest/tcltest.tcl @@ -16,7 +16,7 @@ # Contributions from Don Porter, NIST, 2002. (not subject to US copyright) # All rights reserved. # -# RCS: @(#) $Id: tcltest.tcl,v 1.91 2004/05/26 16:25:00 dgp Exp $ +# RCS: @(#) $Id: tcltest.tcl,v 1.92 2004/10/30 02:16:52 dgp Exp $ package require Tcl 8.3 ;# uses [glob -directory] namespace eval tcltest { @@ -24,7 +24,7 @@ namespace eval tcltest { # When the version number changes, be sure to update the pkgIndex.tcl file, # and the install directory in the Makefiles. When the minor version # changes (new feature) be sure to update the man page as well. - variable Version 2.2.6 + variable Version 2.2.7 # Compatibility support for dumb variables defined in tcltest 1 # Do not use these. Call [package provide Tcl] and [info patchlevel] @@ -1458,8 +1458,10 @@ proc tcltest::ProcessFlags {flagArray} { } # Call the hook - array set flag $flagArray - processCmdLineArgsHook [array get flag] + catch { + array set flag $flagArray + processCmdLineArgsHook [array get flag] + } return } diff --git a/tests/all.tcl b/tests/all.tcl index f5e7c39..f83536d 100644 --- a/tests/all.tcl +++ b/tests/all.tcl @@ -10,12 +10,10 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: all.tcl,v 1.17 2004/03/17 18:14:17 das Exp $ +# RCS: @(#) $Id: all.tcl,v 1.18 2004/10/30 02:16:52 dgp Exp $ -set tcltestVersion [package require tcltest] -namespace import -force tcltest::* - -tcltest::testsDirectory [file dir [info script]] -tcltest::runAllTests - -return +package require Tcl 8.5 +package require tcltest 2.2 +namespace import tcltest::* +configure {expand}$argv -testdir [file dir [info script]] +runAllTests diff --git a/unix/Makefile.in b/unix/Makefile.in index 49b6097..578c4ee 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -5,7 +5,7 @@ # "autoconf" program (constructs like "@foo@" will get replaced in the # actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.147 2004/10/26 20:35:26 dgp Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.148 2004/10/30 02:17:08 dgp Exp $ VERSION = @TCL_VERSION@ MAJOR_VERSION = @TCL_MAJOR_VERSION@ @@ -683,8 +683,8 @@ install-libraries: libraries install-tzdata install-msgs done; @echo "Installing package msgcat 1.4.1 as a Tcl Module"; @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.5/msgcat-1.4.1.tm; - @echo "Installing package tcltest 2.2.6 as a Tcl Module"; - @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.3/tcltest-2.2.6.tm; + @echo "Installing package tcltest 2.2.7 as a Tcl Module"; + @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.3/tcltest-2.2.7.tm; @echo "Installing library encoding directory"; @for i in $(TOP_DIR)/library/encoding/*.enc ; do \ $(INSTALL_DATA) $$i $(SCRIPT_INSTALL_DIR)/encoding; \ -- cgit v0.12