1 files changed, 14 insertions, 17 deletions
diff --git a/tests/parseOld.test b/tests/parseOld.test
index 27978e2..c8f82cf 100644
--- a/tests/parseOld.test
+++ b/tests/parseOld.test
@@ -13,13 +13,10 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    package require tcltest
-    namespace import -force ::tcltest::*
-}
+package require tcltest
+namespace import ::tcltest::*
 
-tcltest::testConstraint testwordend \
-	[string equal "testwordend" [info commands testwordend]]
+testConstraint testwordend [llength [info commands testwordend]]
 
 # Save the argv value for restoration later
 set savedArgv $argv
@@ -164,25 +161,25 @@ test parseOld-5.6 {variable substitution} {
     set msg
 } {can't read "_non_existent_": no such variable}
 test parseOld-5.7 {array variable substitution} {
-    catch {unset a}
+    unset -nocomplain a
     set a(xyz) 123
     set b $a(xyz)foo
     set b
 } 123foo
 test parseOld-5.8 {array variable substitution} {
-    catch {unset a}
+    unset -nocomplain a
     set "a(x y z)" 123
     set b $a(x y z)foo
     set b
 } 123foo
 test parseOld-5.9 {array variable substitution} {
-    catch {unset a}; catch {unset qqq}
+    unset -nocomplain a qqq
     set "a(x y z)" qqq
     set $a([format x]\ y [format z]) foo
     set qqq
 } foo
 test parseOld-5.10 {array variable substitution} {
-    catch {unset a}
+    unset -nocomplain a
     list [catch {set b $a(22)} msg] $msg
 } {1 {can't read "a(22)": no such variable}}
 test parseOld-5.11 {array variable substitution} {
@@ -192,9 +189,9 @@ test parseOld-5.11 {array variable substitution} {
 test parseOld-5.12 {empty array name support} {
     list [catch {set b a$()} msg] $msg
 } {1 {can't read "()": no such variable}}
-catch {unset a}
+unset -nocomplain a
 test parseOld-5.13 {array variable substitution} {
-    catch {unset a}
+    unset -nocomplain a
     set long {This is a very long variable, long enough to cause storage \
 	allocation to occur in Tcl_ParseVar.  If that storage isn't getting \
 	freed up correctly, then a core leak will occur when this test is \
@@ -209,13 +206,13 @@ test parseOld-5.13 {array variable substitution} {
 	run.  This text is probably beginning to sound like drivel, but I've \
 	run out of things to say and I need more characters still.}}}
 test parseOld-5.14 {array variable substitution} {
-    catch {unset a}; catch {unset b}; catch {unset a1}
+    unset -nocomplain a b a1
     set a1(22) foo
     set a(foo) bar
     set b $a($a1(22))
     set b
 } bar
-catch {unset a}; catch {unset a1}
+unset -nocomplain a a1
 
 test parseOld-7.1 {backslash substitution} {
     set a "\a\c\n\]\}"
@@ -351,7 +348,7 @@ test parseOld-10.13 {syntax errors} {
 # since MetroWerks may some day fix this.
 
 test parseOld-10.14 {syntax errors} {
-    list [catch {eval \$x[format "%01000d" 0](} msg] $msg $errorInfo
+    list [catch {eval \$x[format "%01000d" 0](} msg] $msg $::errorInfo
 } {1 {missing )} {missing )
     while executing
 "$x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000..."
@@ -466,7 +463,7 @@ test parseOld-14.3 {TclWordEnd procedure} {testwordend} {
 test parseOld-14.4 {TclWordEnd procedure} {testwordend} {
     testwordend {"abc"}
 } {"}
-#" Emacs formatting >:^(
+#" Emacs formatting :^(
 test parseOld-14.5 {TclWordEnd procedure} {testwordend} {
     testwordend {{xyz}}
 } \}
@@ -512,7 +509,7 @@ test parseOld-14.18 {TclWordEnd procedure} {testwordend} {
 test parseOld-14.19 {TclWordEnd procedure} {testwordend} {
     testwordend \"a\000\"
 } {"}
-#" Emacs formatting >:^(
+#" Emacs formatting :^(
 test parseOld-14.20 {TclWordEnd procedure} {testwordend} {
     testwordend a{\000}b
 } {b}