head	1.1;
access;
symbols
	RELEASE_8_3_0:1.1
	RELEASE_9_0_0:1.1
	RELEASE_7_4_0:1.1
	RELEASE_8_2_0:1.1
	RELEASE_6_EOL:1.1
	RELEASE_8_1_0:1.1;
locks; strict;
comment	@# @;


1.1
date	2010.06.12.03.57.41;	author mi;	state Exp;
branches;
next	;


desc
@@


1.1
log
@Upgrade itcl to 3.4b1 -- the last version in the 3.x branch.

itk, interestingly, remains at 3.3-RC, so only minor changes
there.

Allow both to compile against Tcl-8.5. Both will now need to
be upgraded to branch 4.x -- a much more involved undertaking.

Approved by:	maintainer (in January)
@
text
@--- tests/ensemble.test	2004-02-12 13:09:50.000000000 -0500
+++ tests/ensemble.test	2010-01-24 14:57:20.000000000 -0500
@@@@ -97,12 +97,19 @@@@
 "itcl::ensemble test_numbers {part foo}"}}
 
-test ensemble-1.11 {part argument errors are handled gracefully} {
-    list [catch "itcl::ensemble test_numbers {part foo {{}} {}}" msg] $msg $errorInfo
-} {1 {procedure "foo" has argument with no name} {procedure "foo" has argument with no name
+if {$tcl_version < 8.5} {
+	set errmsg111 {procedure "foo" has argument with no name}
+} else {
+	set errmsg111 {argument with no name}
+}
+set errmsg111 [format {1 {%s} {%s
     while executing
 "part foo {{}} {}"
     ("ensemble" body line 1)
     invoked from within
-"itcl::ensemble test_numbers {part foo {{}} {}}"}}
+"itcl::ensemble test_numbers {part foo {{}} {}}"}} $errmsg111 $errmsg111]
+
+test ensemble-1.11 {part argument errors are handled gracefully} {
+    list [catch "itcl::ensemble test_numbers {part foo {{}} {}}" msg] $msg $errorInfo
+} $errmsg111
 
 test ensemble-2.0 {defining subensembles} {
@
