From f3126d6258f2f5d12a84332b79d1f183778e0fc0 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Thu, 7 Jul 2011 17:41:00 +0000
Subject: Correct test suite errors revealed by a -singleproc 1 -debug 1 run.

---
 tests/assemble.test  | 4 ++--
 tests/chanio.test    | 2 +-
 tests/coroutine.test | 1 +
 tests/ioTrans.test   | 8 +++++---
 tests/ooNext2.test   | 2 +-
 tests/package.test   | 2 +-
 6 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/tests/assemble.test b/tests/assemble.test
index 761b36b..dae4821 100644
--- a/tests/assemble.test
+++ b/tests/assemble.test
@@ -767,7 +767,7 @@ test assemble-7.43 {uplus} {
     -returnCodes error
     -result {can't use non-numeric floating-point value as operand of "+"}
 }
-test assemble-7.43 {tryCvtToNumeric} {
+test assemble-7.43.1 {tryCvtToNumeric} {
     -body {
 	assemble {
 	    push NaN; tryCvtToNumeric
@@ -1562,7 +1562,7 @@ test assemble-15.6 {listIndexImm} {
     }
     -result b
 }
-test assemble-15.6 {listIndexImm} {
+test assemble-15.7 {listIndexImm} {
     -body {
 	assemble {push {a b c}; listIndexImm end}
     }
diff --git a/tests/chanio.test b/tests/chanio.test
index 4f44d3f..5569385 100644
--- a/tests/chanio.test
+++ b/tests/chanio.test
@@ -7720,7 +7720,7 @@ test chan-io-73.1 {channel Tcl_Obj SetChannelFromAny} -body {
 
 # cleanup
 foreach file [list fooBar longfile script output test1 pipe my_script \
-	test2 test3 cat stdout kyrillic.txt utf8-fcopy.txt utf8-rp.txt] {
+	test2 test3 cat kyrillic.txt utf8-fcopy.txt utf8-rp.txt] {
     removeFile $file
 }
 cleanupTests
diff --git a/tests/coroutine.test b/tests/coroutine.test
index bc72017..7d5169b 100644
--- a/tests/coroutine.test
+++ b/tests/coroutine.test
@@ -455,6 +455,7 @@ test coroutine-4.7 {compile context, bug #3282869} -setup {
     set ::x [f 12]
     D
 } -cleanup {
+    D
     unset ::x
     rename f {}
 } -result YX15
diff --git a/tests/ioTrans.test b/tests/ioTrans.test
index 8dbad78..3ea017b 100644
--- a/tests/ioTrans.test
+++ b/tests/ioTrans.test
@@ -1790,6 +1790,7 @@ test iortrans.tf-11.0 {origin thread of moved transform gone} -setup {
 } -constraints {testchannel testthread} -match glob -body {
     # Set up channel in thread
     testthread send $tida $helperscript
+    testthread send $tidb $helperscript
     set chan [testthread send $tida {
 	proc foo {args} {
 	    handle.initialize clear drain flush limit? read write
@@ -1816,8 +1817,8 @@ test iortrans.tf-11.0 {origin thread of moved transform gone} -setup {
     # The 'tell' is ok, as it passed through the transform to the base
     # channel without invoking the transform handler.
 } -cleanup {
+    testthread send $tidb tempdone
     tcltest::threadReap
-    tempdone
 } -result {1 {Owner lost} 0 0 1 {Owner lost} 1 {Owner lost} 1 {Owner lost}}
 test iortrans.tf-11.1 {origin thread of moved transform destroyed during access} -setup {
     #puts <<$tcltest::mainThread>>main
@@ -1825,7 +1826,8 @@ test iortrans.tf-11.1 {origin thread of moved transform destroyed during access}
     set tidb [testthread create];	#puts <<$tidb>>
 } -constraints {testchannel testthread} -match glob -body {
     # Set up channel in thread
-    set chan [testthread send $tida $helperscript]
+    testthread send $tida $helperscript
+    testthread send $tidb $helperscript
     set chan [testthread send $tida {
 	proc foo {args} {
 	    handle.initialize clear drain flush limit? read write
@@ -1857,8 +1859,8 @@ test iortrans.tf-11.1 {origin thread of moved transform destroyed during access}
     vwait ::res
     return $res
 } -cleanup {
+    testthread send $tidb tempdone
     tcltest::threadReap
-    tempdone
 } -result {Owner lost}
 
 # ### ### ### ######### ######### #########
diff --git a/tests/ooNext2.test b/tests/ooNext2.test
index fc0423f..51f02c5 100644
--- a/tests/ooNext2.test
+++ b/tests/ooNext2.test
@@ -671,7 +671,7 @@ test oo-call-2.10 {class call introspection - errors} -body {
 test oo-call-2.11 {class call introspection - errors} -body {
     info class call notaclass x
 } -returnCodes error -result {notaclass does not refer to an object}
-test oo-call-2.11 {class call introspection - errors} -setup {
+test oo-call-2.12 {class call introspection - errors} -setup {
     oo::class create root
 } -body {
     root create notaclass
diff --git a/tests/package.test b/tests/package.test
index bd57e86..da778f1 100644
--- a/tests/package.test
+++ b/tests/package.test
@@ -1039,7 +1039,7 @@ foreach {r p vs vc} {
     incr n
 }
 
-test package-11.0 {package vcompare at 32bit boundary} {
+test package-11.0.0 {package vcompare at 32bit boundary} {
     package vcompare [expr {1<<31}] [expr {(1<<31)-1}]
 } 1
 
-- 
cgit v0.12