fix [2021443] inconsistant "wrong # args" messages

25 files changed, 67 insertions, 67 deletions

diff --git a/tests/append.test b/tests/append.test
index 62240cd..14377fa 100644
--- a/tests/append.test
+++ b/tests/append.test
@@ -11,7 +11,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: append.test,v 1.9 2006/12/17 03:44:20 das Exp $
+# RCS: @(#) $Id: append.test,v 1.10 2008/07/19 22:50:39 nijtmans Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
@@ -46,7 +46,7 @@ test append-2.1 {long appends} {
 
 test append-3.1 {append errors} {
     list [catch {append} msg] $msg
-} {1 {wrong # args: should be "append varName ?value value ...?"}}
+} {1 {wrong # args: should be "append varName ?value ...?"}}
 test append-3.2 {append errors} {
     set x ""
     list [catch {append x(0) 44} msg] $msg
@@ -177,7 +177,7 @@ test append-5.1 {long lappends} {
 
 test append-6.1 {lappend errors} {
     list [catch {lappend} msg] $msg
-} {1 {wrong # args: should be "lappend varName ?value value ...?"}}
+} {1 {wrong # args: should be "lappend varName ?value ...?"}}
 test append-6.2 {lappend errors} {
     set x ""
     list [catch {lappend x(0) 44} msg] $msg
diff --git a/tests/appendComp.test b/tests/appendComp.test
index c946d35..dd0b4d0 100644
--- a/tests/appendComp.test
+++ b/tests/appendComp.test
@@ -11,7 +11,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: appendComp.test,v 1.9 2005/05/10 18:34:56 kennykb Exp $
+# RCS: @(#) $Id: appendComp.test,v 1.10 2008/07/19 22:50:38 nijtmans Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest 2
@@ -57,7 +57,7 @@ test appendComp-2.1 {long appends} {
 test appendComp-3.1 {append errors} {
     proc foo {} {append}
     list [catch {foo} msg] $msg
-} {1 {wrong # args: should be "append varName ?value value ...?"}}
+} {1 {wrong # args: should be "append varName ?value ...?"}}
 test appendComp-3.2 {append errors} {
     proc foo {} {
 	set x ""
@@ -232,7 +232,7 @@ test appendComp-5.1 {long lappends} {
 test appendComp-6.1 {lappend errors} {
     proc foo {} {lappend}
     list [catch {foo} msg] $msg
-} {1 {wrong # args: should be "lappend varName ?value value ...?"}}
+} {1 {wrong # args: should be "lappend varName ?value ...?"}}
 test appendComp-6.2 {lappend errors} {
     proc foo {} {
 	set x ""
diff --git a/tests/apply.test b/tests/apply.test
index 8c12216..95f4fd8 100644
--- a/tests/apply.test
+++ b/tests/apply.test
@@ -12,7 +12,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: apply.test,v 1.12 2007/12/13 15:26:04 dgp Exp $
+# RCS: @(#) $Id: apply.test,v 1.13 2008/07/19 22:50:39 nijtmans Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest 2.2
@@ -30,7 +30,7 @@ testConstraint memory [llength [info commands memory]]
 test apply-1.1 {too few arguments} {
     set res [catch apply msg]
     list $res $msg
-} {1 {wrong # args: should be "apply lambdaExpr ?arg1 arg2 ...?"}}
+} {1 {wrong # args: should be "apply lambdaExpr ?arg ...?"}}
 
 # Tests for malformed lambda
 
diff --git a/tests/binary.test b/tests/binary.test
index 77306b4..2f71866 100644
--- a/tests/binary.test
+++ b/tests/binary.test
@@ -10,7 +10,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: binary.test,v 1.34 2008/06/03 23:52:51 patthoyts Exp $
+# RCS: @(#) $Id: binary.test,v 1.35 2008/07/19 22:50:38 nijtmans Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
@@ -39,7 +39,7 @@ test binary-1.2 {Tcl_BinaryObjCmd: bad args} -body {
 test binary-1.3 {Tcl_BinaryObjCmd: format error} -body {
     binary f
 } -returnCodes error \
-  -result {wrong # args: should be "binary format formatString ?arg arg ...?"}
+  -result {wrong # args: should be "binary format formatString ?arg ...?"}
 test binary-1.4 {Tcl_BinaryObjCmd: format} -body {
     binary format ""
 } -result {}
@@ -592,10 +592,10 @@ test binary-18.1 {Tcl_BinaryObjCmd: format} {
 
 test binary-19.1 {Tcl_BinaryObjCmd: errors} {
     list [catch {binary s} msg] $msg
-} {1 {wrong # args: should be "binary scan value formatString ?varName varName ...?"}}
+} {1 {wrong # args: should be "binary scan value formatString ?varName ...?"}}
 test binary-19.2 {Tcl_BinaryObjCmd: errors} {
     list [catch {binary scan foo} msg] $msg
-} {1 {wrong # args: should be "binary scan value formatString ?varName varName ...?"}}
+} {1 {wrong # args: should be "binary scan value formatString ?varName ...?"}}
 test binary-19.3 {Tcl_BinaryObjCmd: scan} {
     binary scan {} {}
 } 0
diff --git a/tests/chan.test b/tests/chan.test
index ea2529c..b047883 100644
--- a/tests/chan.test
+++ b/tests/chan.test
@@ -7,7 +7,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: chan.test,v 1.13 2008/07/13 23:15:22 nijtmans Exp $
+# RCS: @(#) $Id: chan.test,v 1.14 2008/07/19 22:50:38 nijtmans Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest 2
@@ -21,7 +21,7 @@ if {[lsearch [namespace children] ::tcltest] == -1} {
 
 test chan-1.1 {chan command general syntax} -body {
     chan
-} -returnCodes error -result "wrong # args: should be \"chan subcommand ?argument ...?\""
+} -returnCodes error -result "wrong # args: should be \"chan subcommand ?arg ...?\""
 test chan-1.2 {chan command general syntax} -body {
     chan FOOBAR
 } -returnCodes error -result "unknown or ambiguous subcommand \"FOOBAR\": must be blocked, close, configure, copy, create, eof, event, flush, gets, names, pending, pop, postevent, push, puts, read, seek, tell, or truncate"
diff --git a/tests/config.test b/tests/config.test
index 2023d9c..cc951fb 100644
--- a/tests/config.test
+++ b/tests/config.test
@@ -12,7 +12,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: config.test,v 1.4 2004/10/29 15:39:10 dkf Exp $
+# RCS: @(#) $Id: config.test,v 1.5 2008/07/19 22:50:38 nijtmans Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
@@ -35,7 +35,7 @@ test pkgconfig-1.3 {query value multiple times} {
 test pkgconfig-2.0 {error: missing subcommand} {
     catch {::tcl::pkgconfig} msg
     set msg
-} {wrong # args: should be "::tcl::pkgconfig subcommand ?argument?"}
+} {wrong # args: should be "::tcl::pkgconfig subcommand ?arg?"}
 test pkgconfig-2.1 {error: illegal subcommand} {
     catch {::tcl::pkgconfig foo} msg
     set msg
@@ -55,7 +55,7 @@ test pkgconfig-2.4 {error: query unknown key} {
 test pkgconfig-2.5 {error: query with to many arguments} {
     catch {::tcl::pkgconfig get foo bar} msg
     set msg
-} {wrong # args: should be "::tcl::pkgconfig subcommand ?argument?"}
+} {wrong # args: should be "::tcl::pkgconfig subcommand ?arg?"}
 
 # cleanup
 ::tcltest::cleanupTests
diff --git a/tests/dict.test b/tests/dict.test
index d3373e2..e8fe560 100644
--- a/tests/dict.test
+++ b/tests/dict.test
@@ -9,7 +9,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: dict.test,v 1.29 2008/05/09 03:51:33 kennykb Exp $
+# RCS: @(#) $Id: dict.test,v 1.30 2008/07/19 22:50:39 nijtmans Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest 2
@@ -35,7 +35,7 @@ proc getOrder {dictVal args} {
 
 test dict-1.1 {dict command basic syntax} -returnCodes error -body {
     dict
-} -result {wrong # args: should be "dict subcommand ?argument ...?"}
+} -result {wrong # args: should be "dict subcommand ?arg ...?"}
 test dict-1.2 {dict command basic syntax} -returnCodes error -body {
     dict ?
 } -match glob -result {unknown or ambiguous subcommand "?": must be *}
@@ -99,7 +99,7 @@ test dict-3.10 {dict get command} -returnCodes error -body {
 test dict-3.11 {dict get command} {dict get [dict create a b c d] a} b
 test dict-3.12 {dict get command} -returnCodes error -body {
     dict get
-} -result {wrong # args: should be "dict get dictionary ?key key ...?"}
+} -result {wrong # args: should be "dict get dictionary ?key ...?"}
 test dict-3.13 {dict get command} {
     set dict [dict get {a b c d}]
     if {$dict eq "a b c d"} {
@@ -764,7 +764,7 @@ test dict-17.20 {dict filter command: script} -returnCodes error -body {
 } -result {unmatched open brace in list}
 test dict-17.21 {dict filter command} -returnCodes error -body {
     dict filter {a b}
-} -result {wrong # args: should be "dict filter dictionary filterType ..."}
+} -result {wrong # args: should be "dict filter dictionary filterType ?arg ...?"}
 test dict-17.22 {dict filter command} -returnCodes error -body {
     dict filter {a b} JUNK
 } -result {bad filterType "JUNK": must be key, script, or value}
diff --git a/tests/format.test b/tests/format.test
index a985eeb..1b8869a 100644
--- a/tests/format.test
+++ b/tests/format.test
@@ -10,7 +10,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: format.test,v 1.26 2008/04/07 15:23:11 rmax Exp $
+# RCS: @(#) $Id: format.test,v 1.27 2008/07/19 22:50:39 nijtmans Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest 2
@@ -288,7 +288,7 @@ test format-8.1 {error conditions} {
 test format-8.2 {error conditions} {
     catch format msg
     set msg
-} {wrong # args: should be "format formatString ?arg arg ...?"}
+} {wrong # args: should be "format formatString ?arg ...?"}
 test format-8.3 {error conditions} {
     catch {format %*d}
 } 1
diff --git a/tests/info.test b/tests/info.test
index 54a548a..a83a1fc 100644
--- a/tests/info.test
+++ b/tests/info.test
@@ -13,7 +13,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: info.test,v 1.49 2008/06/16 19:59:04 andreas_kupries Exp $
+# RCS: @(#) $Id: info.test,v 1.50 2008/07/19 22:50:38 nijtmans Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest 2
@@ -672,7 +672,7 @@ test info-20.5 {info functions option} -returnCodes error -body {
 
 test info-21.1 {miscellaneous error conditions} -returnCodes error -body {
     info
-} -result {wrong # args: should be "info subcommand ?argument ...?"}
+} -result {wrong # args: should be "info subcommand ?arg ...?"}
 test info-21.2 {miscellaneous error conditions} -returnCodes error -body {
     info gorp
 } -result {unknown or ambiguous subcommand "gorp": must be args, body, class, cmdcount, commands, complete, default, exists, frame, functions, globals, hostname, level, library, loaded, locals, nameofexecutable, object, patchlevel, procs, script, sharedlibextension, tclversion, or vars}
diff --git a/tests/interp.test b/tests/interp.test
index c47b8a7..33dfda9 100644
--- a/tests/interp.test
+++ b/tests/interp.test
@@ -10,7 +10,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: interp.test,v 1.59 2008/07/13 23:15:22 nijtmans Exp $
+# RCS: @(#) $Id: interp.test,v 1.60 2008/07/19 22:50:38 nijtmans Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest 2.1
@@ -275,7 +275,7 @@ test interp-8.2 {testing basic alias invocation} {
 test interp-8.3 {testing basic alias invocation} {
    catch {interp create a}
    list [catch {a alias} msg] $msg
-} {1 {wrong # args: should be "a alias aliasName ?targetName? ?args..?"}}
+} {1 {wrong # args: should be "a alias aliasName ?targetName? ?arg ...?"}}
 
 # Part 8: Testing aliases for non-existent or hidden targets
 test interp-9.1 {testing aliases for non-existent targets} {
diff --git a/tests/ioCmd.test b/tests/ioCmd.test
index 47c8daa..9648843 100644
--- a/tests/ioCmd.test
+++ b/tests/ioCmd.test
@@ -13,7 +13,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: ioCmd.test,v 1.44 2008/07/13 23:15:21 nijtmans Exp $
+# RCS: @(#) $Id: ioCmd.test,v 1.45 2008/07/19 22:50:38 nijtmans Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest 2
@@ -637,7 +637,7 @@ close $wfile
 test iocmd-20.0 {chan, wrong#args} {
     catch {chan} msg
     set msg
-} {wrong # args: should be "chan subcommand ?argument ...?"}
+} {wrong # args: should be "chan subcommand ?arg ...?"}
 test iocmd-20.1 {chan, unknown method} {
     catch {chan foo} msg
     set msg
diff --git a/tests/ioTrans.test b/tests/ioTrans.test
index 6298af0..e7c7d72 100644
--- a/tests/ioTrans.test
+++ b/tests/ioTrans.test
@@ -11,7 +11,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: ioTrans.test,v 1.4 2008/06/20 20:48:49 dgp Exp $
+# RCS: @(#) $Id: ioTrans.test,v 1.5 2008/07/19 22:50:39 nijtmans Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest 2
@@ -115,7 +115,7 @@ eval $helperscript
 test iortrans-1.0 {chan, wrong#args} {
     catch {chan} msg
     set msg
-} {wrong # args: should be "chan subcommand ?argument ...?"}
+} {wrong # args: should be "chan subcommand ?arg ...?"}
 test iortrans-1.1 {chan, unknown method} {
     catch {chan foo} msg
     set msg
diff --git a/tests/namespace.test b/tests/namespace.test
index f88e93c..a0035e6 100644
--- a/tests/namespace.test
+++ b/tests/namespace.test
@@ -11,7 +11,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: namespace.test,v 1.72 2008/06/20 20:48:49 dgp Exp $
+# RCS: @(#) $Id: namespace.test,v 1.73 2008/07/19 22:50:38 nijtmans Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest 2
@@ -1764,7 +1764,7 @@ test namespace-46.3 {ensemble: implementation errors} {
     lappend result $ns::count
     namespace delete ns
     lappend result [info command p]
-} {1 {wrong # args: should be "ns subcommand ?argument ...?"} 10 3010 3010 {}}
+} {1 {wrong # args: should be "ns subcommand ?arg ...?"} 10 3010 3010 {}}
 test namespace-46.4 {ensemble: implementation errors} {
     namespace eval ns {
 	namespace ensemble create
@@ -2045,7 +2045,7 @@ test namespace-50.1 {ensembles affect proc arguments error messages} -body {
     namespace ens cre -command a -map {b {bb foo}}
     proc bb {c d {e f} args} {list $c $args}
     a b
-} -returnCodes error -result "wrong # args: should be \"a b d ?e? ...\"" -cleanup {
+} -returnCodes error -result "wrong # args: should be \"a b d ?e? ?arg ...?\"" -cleanup {
     rename a {}
     rename bb {}
 }
diff --git a/tests/oo.test b/tests/oo.test
index 3f9fa94..f9b7be4 100644
--- a/tests/oo.test
+++ b/tests/oo.test
@@ -7,7 +7,7 @@
 # See the file "license.terms" for information on usage and redistribution of
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: oo.test,v 1.7 2008/06/19 21:29:04 dkf Exp $
+# RCS: @(#) $Id: oo.test,v 1.8 2008/07/19 22:50:39 nijtmans Exp $
 
 package require TclOO 0.4 ;# Must match value in configure.in
 if {[lsearch [namespace children] ::tcltest] == -1} {
@@ -1117,7 +1117,7 @@ test oo-15.3 {OO: class cloning} {
 
 test oo-16.1 {OO: object introspection} -body {
     info object
-} -returnCodes 1 -result "wrong \# args: should be \"info object subcommand ?argument ...?\""
+} -returnCodes 1 -result "wrong \# args: should be \"info object subcommand ?arg ...?\""
 test oo-16.2 {OO: object introspection} -body {
     info object class NOTANOBJECT
 } -returnCodes 1 -result {NOTANOBJECT does not refer to an object}
@@ -1215,7 +1215,7 @@ test oo-16.11 {OO: object introspection} -setup {
 
 test oo-17.1 {OO: class introspection} -body {
     info class
-} -returnCodes 1 -result "wrong \# args: should be \"info class subcommand ?argument ...?\""
+} -returnCodes 1 -result "wrong \# args: should be \"info class subcommand ?arg ...?\""
 test oo-17.2 {OO: class introspection} -body {
     info class superclass NOTANOBJECT
 } -returnCodes 1 -result {NOTANOBJECT does not refer to an object}
diff --git a/tests/pkg.test b/tests/pkg.test
index 1d94cb3..4f92d4c 100644
--- a/tests/pkg.test
+++ b/tests/pkg.test
@@ -11,7 +11,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: pkg.test,v 1.30 2008/07/13 23:15:21 nijtmans Exp $
+# RCS: @(#) $Id: pkg.test,v 1.31 2008/07/19 22:50:39 nijtmans Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest 2
@@ -525,7 +525,7 @@ test pkg-2.52 {Tcl_PkgRequire procedure, picking best stable version} {
 
 test pkg-3.1 {Tcl_PackageCmd procedure} {
     list [catch {package} msg] $msg
-} {1 {wrong # args: should be "package option ?arg arg ...?"}}
+} {1 {wrong # args: should be "package option ?arg ...?"}}
 test pkg-3.2 {Tcl_PackageCmd procedure, "forget" option} {
     foreach i [package names] {
 	package forget $i
@@ -735,7 +735,7 @@ test pkg-3.46 {Tcl_PackageCmd procedure, "versions" option} {
 } {2.3 2.4}
 test pkg-3.47 {Tcl_PackageCmd procedure, "vsatisfies" option} {
     list [catch {package vsatisfies a} msg] $msg
-} {1 {wrong # args: should be "package vsatisfies version requirement requirement..."}}
+} {1 {wrong # args: should be "package vsatisfies version ?requirement ...?"}}
 
 test pkg-3.49 {Tcl_PackageCmd procedure, "vsatisfies" option} {
     list [catch {package vsatisfies x.y 3.4} msg] $msg
diff --git a/tests/proc-old.test b/tests/proc-old.test
index 7e2a067..d0a116e 100644
--- a/tests/proc-old.test
+++ b/tests/proc-old.test
@@ -14,7 +14,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: proc-old.test,v 1.15 2006/10/09 19:15:45 msofer Exp $
+# RCS: @(#) $Id: proc-old.test,v 1.16 2008/07/19 22:50:39 nijtmans Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
@@ -233,7 +233,7 @@ test proc-old-30.12 {arguments and defaults} {
 	return [list $x $y $args]
     }
     list [catch {tproc} msg] $msg
-} {1 {wrong # args: should be "tproc x ?y? ..."}}
+} {1 {wrong # args: should be "tproc x ?y? ?arg ...?"}}
 
 test proc-old-4.1 {variable numbers of arguments} {
     proc tproc args {return $args}
@@ -258,7 +258,7 @@ test proc-old-4.5 {variable numbers of arguments} {
 test proc-old-4.6 {variable numbers of arguments} {
     proc tproc {x missing args} {return $args}
     list [catch {tproc 1} msg] $msg
-} {1 {wrong # args: should be "tproc x missing ..."}}
+} {1 {wrong # args: should be "tproc x missing ?arg ...?"}}
 
 test proc-old-5.1 {error conditions} {
     list [catch {proc} msg] $msg
diff --git a/tests/registry.test b/tests/registry.test
index a2329b2..bf32e68 100644
--- a/tests/registry.test
+++ b/tests/registry.test
@@ -10,7 +10,7 @@
 # Copyright (c) 1997 by Sun Microsystems, Inc.  All rights reserved.
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 #
-# RCS: @(#) $Id: registry.test,v 1.21 2007/04/20 13:39:04 dkf Exp $
+# RCS: @(#) $Id: registry.test,v 1.22 2008/07/19 22:50:39 nijtmans Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest 2
@@ -38,7 +38,7 @@ testConstraint english [expr {
 
 test registry-1.1 {argument parsing for registry command} {win reg} {
     list [catch {registry} msg] $msg
-} {1 {wrong # args: should be "registry option ?arg arg ...?"}}
+} {1 {wrong # args: should be "registry option ?arg ...?"}}
 test registry-1.2 {argument parsing for registry command} {win reg} {
     list [catch {registry foo} msg] $msg
 } {1 {bad option "foo": must be broadcast, delete, get, keys, set, type, or values}}
diff --git a/tests/scan.test b/tests/scan.test
index 2a07f4b..ef40d4b 100644
--- a/tests/scan.test
+++ b/tests/scan.test
@@ -11,7 +11,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: scan.test,v 1.21 2006/04/25 17:15:25 dgp Exp $
+# RCS: @(#) $Id: scan.test,v 1.22 2008/07/19 22:50:39 nijtmans Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest 2
@@ -100,10 +100,10 @@ test scan-3.13 {ValidateFormat} {
 
 test scan-4.1 {Tcl_ScanObjCmd, argument checks} {
     list [catch {scan} msg] $msg
-} {1 {wrong # args: should be "scan string format ?varName varName ...?"}}
+} {1 {wrong # args: should be "scan string format ?varName ...?"}}
 test scan-4.2 {Tcl_ScanObjCmd, argument checks} {
     list [catch {scan string} msg] $msg
-} {1 {wrong # args: should be "scan string format ?varName varName ...?"}}
+} {1 {wrong # args: should be "scan string format ?varName ...?"}}
 test scan-4.3 {Tcl_ScanObjCmd, argument checks} {
     # degenerate case, before changed from 8.2 to 8.3
     list [catch {scan string format} msg] $msg
@@ -509,7 +509,7 @@ test scan-8.1 {error conditions} {
 test scan-8.2 {error conditions} {
     catch {scan a} msg
     set msg
-} {wrong # args: should be "scan string format ?varName varName ...?"}
+} {wrong # args: should be "scan string format ?varName ...?"}
 test scan-8.3 {error conditions} {
     list [catch {scan a %D x} msg] $msg
 } {1 {bad scan conversion character "D"}}
diff --git a/tests/set-old.test b/tests/set-old.test
index b6e105b..1a0d5e9 100644
--- a/tests/set-old.test
+++ b/tests/set-old.test
@@ -13,7 +13,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: set-old.test,v 1.19 2007/12/13 15:26:07 dgp Exp $
+# RCS: @(#) $Id: set-old.test,v 1.20 2008/07/19 22:50:39 nijtmans Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
@@ -206,7 +206,7 @@ test set-old-7.2 {unset command} {
     list [catch {unset} msg] $msg
 } {0 {}}
 # Used to return:
-#{1 {wrong # args: should be "unset ?-nocomplain? ?--? ?varName varName ...?"}}
+#{1 {wrong # args: should be "unset ?-nocomplain? ?--? ?varName ...?"}}
 test set-old-7.3 {unset command} {
     catch {unset a}
     list [catch {unset a} msg] $msg
diff --git a/tests/string.test b/tests/string.test
index b42db45..64ec56f 100644
--- a/tests/string.test
+++ b/tests/string.test
@@ -12,7 +12,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: string.test,v 1.72 2008/07/01 13:24:08 dkf Exp $
+# RCS: @(#) $Id: string.test,v 1.73 2008/07/19 22:50:38 nijtmans Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
@@ -29,7 +29,7 @@ test string-1.1 {error conditions} {
 } {1 {unknown or ambiguous subcommand "gorp": must be bytelength, compare, equal, first, index, is, last, length, map, match, range, repeat, replace, reverse, tolower, totitle, toupper, trim, trimleft, trimright, wordend, or wordstart}}
 test string-1.2 {error conditions} {
     list [catch {string} msg] $msg
-} {1 {wrong # args: should be "string subcommand ?argument ...?"}}
+} {1 {wrong # args: should be "string subcommand ?arg ...?"}}
 
 test string-2.1 {string compare, too few args} {
     list [catch {string compare a} msg] $msg
diff --git a/tests/stringComp.test b/tests/stringComp.test
index cf22346..c4680fb 100644
--- a/tests/stringComp.test
+++ b/tests/stringComp.test
@@ -15,7 +15,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: stringComp.test,v 1.15 2007/12/13 15:26:07 dgp Exp $
+# RCS: @(#) $Id: stringComp.test,v 1.16 2008/07/19 22:50:38 nijtmans Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
@@ -33,7 +33,7 @@ test stringComp-1.1 {error conditions} {
 test stringComp-1.2 {error conditions} {
     proc foo {} {string}
     list [catch {foo} msg] $msg
-} {1 {wrong # args: should be "string subcommand ?argument ...?"}}
+} {1 {wrong # args: should be "string subcommand ?arg ...?"}}
 test stringComp-1.3 {error condition - undefined method during compile} {
     # We don't want this to complain about 'never' because it may never
     # be called, or string may get redefined.  This must compile OK.
diff --git a/tests/thread.test b/tests/thread.test
index 97de497..be2bd40 100644
--- a/tests/thread.test
+++ b/tests/thread.test
@@ -11,7 +11,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: thread.test,v 1.19 2008/06/13 05:45:15 mistachkin Exp $
+# RCS: @(#) $Id: thread.test,v 1.20 2008/07/19 22:50:39 nijtmans Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
@@ -39,7 +39,7 @@ if {[testConstraint testthread]} {
 
 test thread-1.1 {Tcl_ThreadObjCmd: no args} {testthread} {
     list [catch {testthread} msg] $msg
-} {1 {wrong # args: should be "testthread option ?args?"}}
+} {1 {wrong # args: should be "testthread option ?arg ...?"}}
 test thread-1.2 {Tcl_ThreadObjCmd: bad option} {testthread} {
     list [catch {testthread foo} msg] $msg
 } {1 {bad option "foo": must be cancel, create, event, exit, id, join, names, send, wait, or errorproc}}
diff --git a/tests/timer.test b/tests/timer.test
index 16eff33..76be883 100644
--- a/tests/timer.test
+++ b/tests/timer.test
@@ -13,7 +13,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: timer.test,v 1.13 2008/04/23 15:44:38 dkf Exp $
+# RCS: @(#) $Id: timer.test,v 1.14 2008/07/19 22:50:39 nijtmans Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest 2
@@ -188,7 +188,7 @@ test timer-5.1 {Tcl_ServiceIdle, self-rescheduling handlers} -setup {
 
 test timer-6.1 {Tcl_AfterCmd procedure, basics} -returnCodes error -body {
     after
-} -result {wrong # args: should be "after option ?arg arg ...?"}
+} -result {wrong # args: should be "after option ?arg ...?"}
 test timer-6.2 {Tcl_AfterCmd procedure, basics} -returnCodes error -body {
     after 2x
 } -result {bad argument "2x": must be cancel, idle, info, or an integer}
@@ -327,7 +327,7 @@ test timer-6.15 {Tcl_AfterCmd procedure, cancel option, multiple interps} -setup
 } -result {2 0 aaa bbb {before b-after}}
 test timer-6.16 {Tcl_AfterCmd procedure, idle option} -body {
     after idle
-} -returnCodes error -result {wrong # args: should be "after idle script script ..."}
+} -returnCodes error -result {wrong # args: should be "after idle script ?script ...?"}
 test timer-6.17 {Tcl_AfterCmd procedure, idle option} {
     set x before
     after idle {set x after}
diff --git a/tests/tm.test b/tests/tm.test
index 3484747..d2f88a2 100644
--- a/tests/tm.test
+++ b/tests/tm.test
@@ -6,7 +6,7 @@
 # Copyright (c) 2004 by Donal K. Fellows.
 # All rights reserved.
 #
-# RCS: @(#) $Id: tm.test,v 1.6 2005/08/29 21:55:27 andreas_kupries Exp $
+# RCS: @(#) $Id: tm.test,v 1.7 2008/07/19 22:50:39 nijtmans Exp $
 
 package require Tcl 8.5
 if {"::tcltest" ni [namespace children]} {
@@ -23,10 +23,10 @@ test tm-1.2 {tm: path command syntax} -returnCodes error -body {
 } -result {unknown or ambiguous subcommand "foo": must be add, list, or remove}
 test tm-1.3 {tm: path command syntax} -returnCodes error -body {
     ::tcl::tm::path add
-} -result "wrong # args: should be \"::tcl::tm::path add path ...\""
+} -result "wrong # args: should be \"::tcl::tm::path add path ?arg ...?\""
 test tm-1.4 {tm: path command syntax} -returnCodes error -body {
     ::tcl::tm::path remove
-} -result "wrong # args: should be \"::tcl::tm::path remove path ...\""
+} -result "wrong # args: should be \"::tcl::tm::path remove path ?arg ...?\""
 test tm-1.5 {tm: path command syntax} -returnCodes error -body {
     ::tcl::tm::path list foobar
 } -result "wrong # args: should be \"::tcl::tm::path list\""
diff --git a/tests/trace.test b/tests/trace.test
index 20a797d..4d924e2 100644
--- a/tests/trace.test
+++ b/tests/trace.test
@@ -11,7 +11,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: trace.test,v 1.61 2007/12/13 15:26:07 dgp Exp $
+# RCS: @(#) $Id: trace.test,v 1.62 2008/07/19 22:50:38 nijtmans Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
@@ -857,13 +857,13 @@ foreach type {variable command} {
 
 test trace-14.1 "trace command, wrong # args errors" {
     list [catch {trace} msg] $msg
-} [list 1 "wrong # args: should be \"trace option ?arg arg ...?\""]
+} [list 1 "wrong # args: should be \"trace option ?arg ...?\""]
 test trace-14.2 "trace command, wrong # args errors" {
     list [catch {trace add} msg] $msg
-} [list 1 "wrong # args: should be \"trace add type ?arg arg ...?\""]
+} [list 1 "wrong # args: should be \"trace add type ?arg ...?\""]
 test trace-14.3 "trace command, wrong # args errors" {
     list [catch {trace remove} msg] $msg
-} [list 1 "wrong # args: should be \"trace remove type ?arg arg ...?\""]
+} [list 1 "wrong # args: should be \"trace remove type ?arg ...?\""]
 test trace-14.4 "trace command, wrong # args errors" {
     list [catch {trace info} msg] $msg
 } [list 1 "wrong # args: should be \"trace info type name\""]