From 889858de26753cb512fda204a65783c308b7b576 Mon Sep 17 00:00:00 2001 From: dgp Date: Mon, 23 Jan 2012 17:43:19 +0000 Subject: Backport patch 2834a01435 to prevent test failures from timing matters. --- tests/exec.test | 4 ++-- tests/socket.test | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/exec.test b/tests/exec.test index 8d36292..46d4d92 100644 --- a/tests/exec.test +++ b/tests/exec.test @@ -312,8 +312,8 @@ test exec-9.6 {commands returning errors} {exec} { list [catch {exec [interpreter] "$path(sh)" -c "\"$path(echo)\" error msg 1>&2"} msg] $msg } {1 {error msg}} test exec-9.7 {commands returning errors} {exec stdio} { - list [catch {exec [interpreter] "$path(sh)" -c "\"$path(echo)\" error msg 1>&2" \ - | [interpreter] "$path(sh)" -c "\"$path(echo)\" error msg 1>&2"} msg] $msg + list [catch {exec [interpreter] "$path(sh)" -c "\"$path(echo)\" error msg 1>&2 ; \"$path(sleep)\" 1" \ + | [interpreter] "$path(sh)" -c "\"$path(echo)\" error msg 1>&2 ; \"$path(sleep)\" 1"} msg] $msg } {1 {error msg error msg}} diff --git a/tests/socket.test b/tests/socket.test index 96b81b8..2b382d6 100644 --- a/tests/socket.test +++ b/tests/socket.test @@ -577,6 +577,7 @@ test socket-2.11 {detecting new data} {socket} { fconfigure $sock -blocking 1 puts $s2 two flush $s2 + after 500 fconfigure $sock -blocking 0 lappend result c:[gets $sock] fconfigure $sock -blocking 1 -- cgit v0.12