@@ -8,11 +8,11 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 #
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: tlsIo.test,v 1.1 2000/06/02 18:47:38 awb Exp $
+# RCS: @(#) $Id: tlsIo.test,v 1.2 2000/06/02 19:17:11 awb Exp $
 
 # Running socket tests with a remote server:
 # ------------------------------------------
 # 
 # Some tests in socket.test depend on the existence of a remote server to
@@ -465,12 +465,13 @@
     set y [gets $f]
     close $f
     list $x $y
 } {{hello abcdefghijklmnop} done}
 
-test socket-2.8 {echo server, loop 50 times, single connection} {socket stdio} {
+test socket-2.8 {echo server, loop 50 times, single connection} {socket stdio pcCrash} {
     makeFile {
+    	package require tls
 	set f [tls::socket -server accept 2835]
 	proc accept {s a p} {
             fileevent $s readable [list echo $s]
             fconfigure $s -buffering line
         }
@@ -512,21 +513,27 @@
 
 test socket-2.9 {socket conflict} {socket stdio} {
     set s [tls::socket -server accept 2828]
     removeFile script
     set f [open script w]
-    puts -nonewline $f {tls::socket -server accept 2828}
+    puts -nonewline $f {package require tls; tls::socket -server accept 2828}
     close $f
     set f [open "|[list $::tcltest::tcltest script]" r]
     gets $f
     after 100
     set x [list [catch {close $f} msg] $msg]
     close $s
     set x
 } {1 {couldn't open socket: address already in use
     while executing
-"socket -server accept 2828"
+"::socket -server {tls::_accept {-server 1} accept} 2828"
+    ("eval" body line 1)
+    invoked from within
+"eval ::socket $sopts"
+    (procedure "tls::socket" line 62)
+    invoked from within
+"tls::socket -server accept 2828"
     (file "script" line 1)}}
 
 test socket-2.10 {close on accept, accepted socket lives} {socket pcCrash} {
     set done 0
     set timer [after 20000 "set done timed_out"]
@@ -753,14 +760,15 @@
 	close $msg
     }
     set x
 } {couldn't open socket: not owner}
 
-test socket-6.1 {accept callback error} {socket stdio} {
+test socket-6.1 {accept callback error} {socket stdio pcCrash} {
     removeFile script
     set f [open script w]
     puts $f {
+    	package require tls
 	gets stdin
 	tls::socket 127.0.0.1 2848
     }
     close $f
     set f [open "|[list $::tcltest::tcltest script]" r+]
@@ -804,14 +812,15 @@
     set l ""
     lappend l [string compare [lindex $p 0] 127.0.0.1]
     lappend l [string compare [lindex $p 2] 2820]
     lappend l [llength $p]
 } {0 0 3}
-test socket-7.2 {testing socket specific options} {socket stdio} {
+test socket-7.2 {testing socket specific options} {socket stdio pcCrash} {
     removeFile script
     set f [open script w]
     puts $f {
+	package require tls
 	tls::socket -server accept 2821
 	proc accept args {
 	    global x
 	    set x done
 	}
@@ -1600,10 +1609,11 @@
 
     removeFile script
     threadReap
 
     makeFile {
+    	package require tls
 	set f [tls::socket -server accept 2828]
 	proc accept {s a p} {
             fileevent $s readable [list echo $s]
             fconfigure $s -buffering line
         }