More elimination of dup test numbers [Bugs 710365, 710369]

5 files changed, 22 insertions, 27 deletions

diff --git a/ChangeLog b/ChangeLog
index 351aca7..795c23a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2003-03-27  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
 
+	* tests/parseOld.test:	Altered test numers to eliminate duplicates.
+	* tests/parse.test:	[Bugs 710365, 710369]
+	* tests/expr-old.test:
+	* tests/expr.test:
+
 	* tests/utf.test:	Altered test numers to eliminate duplicates.
 	* tests/trace.test:	[Bugs 710322, 710327, 710349, 710363]
 	* tests/lsearch.test:
diff --git a/tests/expr-old.test b/tests/expr-old.test
index 32f737a..2df8135 100644
--- a/tests/expr-old.test
+++ b/tests/expr-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: expr-old.test,v 1.16 2002/08/05 03:24:41 dgp Exp $
+# RCS: @(#) $Id: expr-old.test,v 1.17 2003/03/27 13:48:58 dkf Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest 2.1
@@ -194,16 +194,16 @@ test expr-old-4.23 {string operators} {expr {"" eq "abd"}} 0
 test expr-old-4.24 {string operators} {expr {"" eq ""}} 1
 test expr-old-4.25 {string operators} {expr {"abd" ne ""}} 1
 test expr-old-4.26 {string operators} {expr {"" ne ""}} 0
-test expr-old-4.26 {string operators} {expr {"longerstring" eq "shorter"}} 0
-test expr-old-4.26 {string operators} {expr {"longerstring" ne "shorter"}} 1
+test expr-old-4.27 {string operators} {expr {"longerstring" eq "shorter"}} 0
+test expr-old-4.28 {string operators} {expr {"longerstring" ne "shorter"}} 1
 
 # The following tests are non-portable because on some systems "+"
 # and "-" can be parsed as numbers.
 
-test expr-old-4.19 {string operators} {nonPortable} {expr {"0" == "+"}} 0
-test expr-old-4.20 {string operators} {nonPortable} {expr {"0" == "-"}} 0
-test expr-old-4.21 {string operators} {expr {1?"foo":"bar"}} foo
-test expr-old-4.22 {string operators} {expr {0?"foo":"bar"}} bar
+test expr-old-4.29 {string operators} {nonPortable} {expr {"0" == "+"}} 0
+test expr-old-4.30 {string operators} {nonPortable} {expr {"0" == "-"}} 0
+test expr-old-4.31 {string operators} {expr {1?"foo":"bar"}} foo
+test expr-old-4.32 {string operators} {expr {0?"foo":"bar"}} bar
 
 # Operators that aren't legal on string operands.
 
diff --git a/tests/expr.test b/tests/expr.test
index c06080f..b11dc15 100644
--- a/tests/expr.test
+++ b/tests/expr.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: expr.test,v 1.17 2002/07/31 09:33:45 dkf Exp $
+# RCS: @(#) $Id: expr.test,v 1.18 2003/03/27 13:48:59 dkf Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
@@ -297,8 +297,8 @@ test expr-8.11 {CompileEqualityExpr: error compiling equality arm} {
     catch {expr 2!=x} msg
     set msg
 } {syntax error in expression "2!=x": variable references require preceding $}
-test expr-8.14 {CompileBitAndExpr: equality expr} {expr {"a"eq"a"}} 1
-test expr-8.14 {CompileBitAndExpr: equality expr} {expr {"\374" eq "ü"}} 1
+test expr-8.12 {CompileBitAndExpr: equality expr} {expr {"a"eq"a"}} 1
+test expr-8.13 {CompileBitAndExpr: equality expr} {expr {"\374" eq "ü"}} 1
 test expr-8.14 {CompileBitAndExpr: equality expr} {expr 3eq2} 0
 test expr-8.15 {CompileBitAndExpr: equality expr} {expr 2.0eq2} 0
 test expr-8.16 {CompileBitAndExpr: equality expr} {expr 3.2ne2.2} 1
diff --git a/tests/parse.test b/tests/parse.test
index 95330be..421bfa4 100644
--- a/tests/parse.test
+++ b/tests/parse.test
@@ -8,7 +8,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: parse.test,v 1.11 2003/02/16 01:36:32 msofer Exp $
+# RCS: @(#) $Id: parse.test,v 1.12 2003/03/27 13:48:59 dkf Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
@@ -731,7 +731,7 @@ test parse-15.57 {CommandComplete procedure} {
 test parse-15.58 {CommandComplete procedure, memory leaks} {
     info complete "1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22"
 } 1
-test parse-15.58 {CommandComplete procedure} {
+test parse-15.59 {CommandComplete procedure} {
     # Test for Tcl Bug 684744
     info complete [encoding convertfrom identity "\x00;if 1 \{"]
 } 0
diff --git a/tests/parseOld.test b/tests/parseOld.test
index 80e6338..40413db 100644
--- a/tests/parseOld.test
+++ b/tests/parseOld.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: parseOld.test,v 1.11 2002/06/25 01:13:38 dgp Exp $
+# RCS: @(#) $Id: parseOld.test,v 1.12 2003/03/27 13:49:00 dkf Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
@@ -321,6 +321,7 @@ test parseOld-10.4 {syntax errors} {
 	catch {set a "bcd} msg
 	set msg
 } {missing "}
+#" Emacs formatting >:^(
 test parseOld-10.5 {syntax errors} {catch {set a "bcd"xy} msg} 1
 test parseOld-10.6 {syntax errors} {
 	catch {set a "bcd"xy} msg
@@ -419,8 +420,7 @@ set i 0
 foreach j [concat 0000 1111 2222 3333 4444 5555 6666 7777 8888 9999 aaaa bbbb cccc dddd eeee ffff gggg hhhh iiii jjjj kkkk llll mmmm nnnn oooo pppp qqqq rrrr ssss tttt uuuu vvvv wwww xxxx yyyy zzzz AAAA BBBB CCCC DDDD EEEE FFFF GGGG HHHH IIII JJJJ KKKK LLLL MMMM NNNN OOOO PPPP QQQQ RRRR SSSS TTTT UUUU VVVV WWWW XXXX YYYY ZZZZ] {
     set test [string index 0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ $i]
     set test $test$test$test$test
-    set i [expr $i+1]
-    test parseOld-11.10 {long values} {
+    test parseOld-11.10-[incr i] {long values} {
 	set j
     } $test
 }
@@ -468,6 +468,7 @@ test parseOld-14.3 {TclWordEnd procedure} {testwordend} {
 test parseOld-14.4 {TclWordEnd procedure} {testwordend} {
     testwordend {"abc"}
 } {"}
+#" Emacs formatting :^(
 test parseOld-14.5 {TclWordEnd procedure} {testwordend} {
     testwordend {{xyz}}
 } \}
@@ -513,6 +514,7 @@ test parseOld-14.18 {TclWordEnd procedure} {testwordend} {
 test parseOld-14.19 {TclWordEnd procedure} {testwordend} {
     testwordend \"a\000\"
 } {"}
+#" Emacs formatting :^(
 test parseOld-14.20 {TclWordEnd procedure} {testwordend} {
     testwordend a{\000}b
 } {b}
@@ -542,15 +544,3 @@ test parseOld-15.5 {TclScriptEnd procedure} {
 set argv $savedArgv
 ::tcltest::cleanupTests
 return
-
-
-
-
-
-
-
-
-
-
-
-