The half-baked set of hunks attempts to chase the wording-changes,
that Tcl-8.5 has compared to the earlier releases. It allows TclX
to pass self-tests, when compiled against Tcl-8.5, but is not
suitable for merging into TclX' own tree.
Someone with enough time to make the tests work with all supported
Tcl-versions, should still do that...
-mi
--- tests/cmdtrace.test 2005-11-17 19:01:35.000000000 -0500
+++ tests/cmdtrace.test 2009-10-13 18:11:52.000000000 -0400
@@ -92,5 +92,5 @@
cmdtrace off
GetTrace $cmdtraceFH
-} 0 "DoStuff4\\n
+} 0 "DoStuff4
DoStuff3
DoStuff2
@@ -103,5 +103,5 @@
if {\$wap} {\\n set wap 0\\n } else \{\\n set wap 1...
set wap 0
-cmdtrace off\\n
+cmdtrace off
"
@@ -132,5 +132,5 @@
cmdtrace off
GetTrace $cmdtraceFH
-} 0 {DoStuff4\n
+} 0 {DoStuff4
DoStuff3
DoStuff2
@@ -143,5 +143,5 @@
if {$wap} {\n set wap 0\n } else {\n set wap 1\n }
set wap 0
-cmdtrace off\n
+cmdtrace off
}
@@ -188,6 +188,5 @@
lappend traceout $errorInfo $errorCode
set traceout
-} 0 [list {CD {{DoStuff4
-}} DoStuff4 {}} \
+} 0 [list {CD DoStuff4 DoStuff4 {}} \
{CD DoStuff3 DoStuff3 {}} \
{CD DoStuff2 DoStuff2 {}} \
@@ -208,6 +207,5 @@
}}} {}} \
{CD {{set wap 0}} {{set wap 0}} {}} \
-{CD {{cmdtrace off
-}} {{cmdtrace off}} {}}\
+{CD {{cmdtrace off}} {{cmdtrace off}} {}}\
ERRORINFO \
ERRORCODE]
--- tests/string.test 2002-09-25 20:19:02.000000000 -0400
+++ tests/string.test 2009-10-13 18:25:03.000000000 -0400
@@ -47,9 +47,19 @@
} 0 {E}
+switch $tcl_version {
+8.3 {
+ set anticipate "syntax error in expression \"4x-3\""
+} 8.4 {
+ puts stderr "tcl_version is $tcl_version"
+ set anticipate "syntax error in expression \"4x-3\": extra tokens at end of expression"
+} default {
+ set anticipate {invalid bareword "x"
+in expression "4_@_x-3";
+should be "$x" or "{x}" or "x(...)" or ...}
+}}
+
Test string-1.7 {cindex tests} {
- cindex ABCDEFG lenx-3
-} 1 "syntax error in expression \"7x-3\"[expr {
- ($tcl_version>8.3) ? ": extra tokens at end of expression" : ""
-}]"
+ cindex ABCD lenx-3
+} 1 $anticipate
Test string-1.8 {cindex tests} {
@@ -146,7 +156,5 @@
# 8.4+ enhanced the error return from expressions
crange ABCD lenx-3 end-1
-} 1 "syntax error in expression \"4x-3\"[expr {
- ($tcl_version>8.3) ? ": extra tokens at end of expression" : ""
-}]"
+} 1 $anticipate
Test string-3.9 {crange tests} {
--- tests/tryeval.test 2002-04-04 01:10:30.000000000 -0500
+++ tests/tryeval.test 2009-10-13 18:31:28.000000000 -0400
@@ -110,10 +110,10 @@
global final
concat $result $final
-} {1 {cont: try_eval error 3.1} {cont: errorInfo-error-3.1
- invoked from within
+} {1 {cont: try_eval error 3.1} {cont: try_eval error 3.1
+ while executing
"try_eval $code $catch $finally"
(procedure "test_try_eval" line 2)
invoked from within
-"test_try_eval $code $catch $finally"} {cont: errorCode-error-3.1} finally-3.1}
+"test_try_eval $code $catch $finally"} NONE finally-3.1}
@@ -148,10 +148,10 @@
global final
concat $result $final
-} {1 {try_eval error 3.3} {errorInfo-error-3.3
- invoked from within
+} {1 {try_eval error 3.3} {try_eval error 3.3
+ while executing
"try_eval $code $catch $finally"
(procedure "test_try_eval" line 2)
invoked from within
-"test_try_eval $code $catch $finally"} errorCode-error-3.3 finally-3.3}
+"test_try_eval $code $catch $finally"} NONE finally-3.3}
test try_eval-3.4 {try_eval error result} {
@@ -168,10 +168,10 @@
global final
list $result $final
-} {{1 {try_eval error 3.4} {errorInfo-error-3.4
- invoked from within
+} {{1 {try_eval error 3.4} {try_eval error 3.4
+ while executing
"try_eval $code $catch $finally"
(procedure "test_try_eval" line 2)
invoked from within
-"test_try_eval $code $catch $finally"} errorCode-error-3.4} finally-3.4}
+"test_try_eval $code $catch $finally"} NONE} finally-3.4}
