1 files changed, 8 insertions, 17 deletions
diff --git a/tests/iogt.test b/tests/iogt.test
index 04da3eb..3882ecc 100644
--- a/tests/iogt.test
+++ b/tests/iogt.test
@@ -15,14 +15,9 @@ if {[catch {package require tcltest 2.1}]} {
     return
 }
 namespace eval ::tcl::test::iogt {
+    namespace import ::tcltest::*
 
-    namespace import ::tcltest::cleanupTests
-    namespace import ::tcltest::makeFile
-    namespace import ::tcltest::removeFile
-    namespace import ::tcltest::test
-    namespace import ::tcltest::testConstraint
-
-    testConstraint testchannel [llength [info commands testchannel]]
+testConstraint testchannel [llength [info commands testchannel]]
 
 set path(dummy) [makeFile {abcdefghijklmnopqrstuvwxyz0123456789,./?><;'\|":[]\}\{`~!@#$%^&*()_+-=
 } dummy]
@@ -129,7 +124,7 @@ proc echoPut {c sock} {
 #fileevent stdin readable {exit ;#cut}
 
 # main
-socket -server newconn $port
+socket -server newconn -myaddr 127.0.0.1 $port
 vwait forever
 } __echo_srv__.tcl]
 
@@ -145,8 +140,8 @@ proc fevent {fdelay idelay blocks script data} {
     # fixed port, not so good. lets hope for the best, for now.
     set port 4000
 
-    eval exec tclsh __echo_srv__.tcl \
-	    $port $fdelay $idelay $blocks >@stdout &
+    exec tclsh __echo_srv__.tcl \
+	    $port $fdelay $idelay {*}$blocks >@stdout &
 
     after 500
 
@@ -487,7 +482,7 @@ test iogt-2.0 {basic I/O going through transform} testchannel {
 } {1 71 71}
 
 
-test iogt-2.1 {basic I/O, operation trail} {testchannel unixOnly} {
+test iogt-2.1 {basic I/O, operation trail} {testchannel unix} {
     set fin  [open $path(dummy)    r]
     set fout [open $path(dummyout) w]
 
@@ -537,7 +532,7 @@ write
 flush/write
 delete/write}
 
-test iogt-2.2 {basic I/O, data trail} {testchannel unixOnly} {
+test iogt-2.2 {basic I/O, data trail} {testchannel unix} {
     set fin  [open $path(dummy)    r]
     set fout [open $path(dummyout) w]
 
@@ -592,7 +587,7 @@ flush/write {} {}
 delete/write {} *ignored*}
 
 
-test iogt-2.3 {basic I/O, mixed trail} {testchannel unixOnly} {
+test iogt-2.3 {basic I/O, mixed trail} {testchannel unix} {
     set fin  [open $path(dummy)    r]
     set fout [open $path(dummyout) w]
 
@@ -880,10 +875,6 @@ delete/read {} *ignored*
 flush/write {} {}
 delete/write {} *ignored*}
 
-
-
-
-
 proc constX {op data} {
     # replace anything coming in with a same-length string of x'es.
     switch -- $op {