diff options
author | rmax <rmax@noemail.net> | 2010-06-25 15:20:06 (GMT) |
---|---|---|
committer | rmax <rmax@noemail.net> | 2010-06-25 15:20:06 (GMT) |
commit | 0e84bb80a683c5a6f3a57e50b51ef21dae0aa928 (patch) | |
tree | c25799a08a3273a558866c1263e5397fa19f2947 | |
parent | 5903629cde6b27dd84ae5503635519885b3afbff (diff) | |
download | tcl-0e84bb80a683c5a6f3a57e50b51ef21dae0aa928.zip tcl-0e84bb80a683c5a6f3a57e50b51ef21dae0aa928.tar.gz tcl-0e84bb80a683c5a6f3a57e50b51ef21dae0aa928.tar.bz2 |
prevent a race condition when shutting down the remote test server
FossilOrigin-Name: ff37c169a8194ab553be2e2615cc37ba3ba7ef56
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | tests/socket.test | 5 |
2 files changed, 9 insertions, 4 deletions
@@ -1,6 +1,12 @@ +2010-06-25 Reinhard Max <max@suse.de> + + * tests/socket.test: Prevent a race condition during shutdown of + the remote test server that can cause a hang when the server is + being run in verbose mode. + 2010-06-24 Jan Nijtmans <nijtmans@users.sf.net> - * win/tclWinPort.h [Bug 3019634] errno.h and tclWinPort.h have + * win/tclWinPort.h [Bug 3019634] errno.h and tclWinPort.h have conflicting definitions. ***POTENTIAL INCOMPATIBILITY*** diff --git a/tests/socket.test b/tests/socket.test index abfe169..99ce29f 100644 --- a/tests/socket.test +++ b/tests/socket.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: socket.test,v 1.42 2008/09/02 15:49:25 dkf Exp $ +# RCS: @(#) $Id: socket.test,v 1.43 2010/06/25 15:20:06 rmax Exp $ # Running socket tests with a remote server: # ------------------------------------------ @@ -1651,8 +1651,7 @@ removeFile script2 # cleanup if {[string match sock* $commandSocket] == 1} { - puts $commandSocket exit - flush $commandSocket + catch {sendCommand exit} } catch {close $commandSocket} catch {close $remoteProcChan} |