diff options
Diffstat (limited to 'testsuite/systemtap.stress')
| -rw-r--r-- | testsuite/systemtap.stress/conversions.exp | 2 | ||||
| -rw-r--r-- | testsuite/systemtap.stress/whitelist.exp | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/testsuite/systemtap.stress/conversions.exp b/testsuite/systemtap.stress/conversions.exp index 89d89250..9c2c2fa9 100644 --- a/testsuite/systemtap.stress/conversions.exp +++ b/testsuite/systemtap.stress/conversions.exp @@ -17,7 +17,7 @@ foreach value {0 0xffffffff 0xffffffffffffffff} { timeout { fail "$test (timeout)" } } verbose -log "done exp $test $errs" - closewait + wait if {$errs == 14} { pass $test } else { fail "$test ($errs)" } verbose -log "done $test $errs" } diff --git a/testsuite/systemtap.stress/whitelist.exp b/testsuite/systemtap.stress/whitelist.exp index f7c0bf16..4a31c124 100644 --- a/testsuite/systemtap.stress/whitelist.exp +++ b/testsuite/systemtap.stress/whitelist.exp @@ -320,7 +320,8 @@ proc whitelist_run { TEST_NAME {LOAD_GEN_FUNCTION ""} args } { timeout { set detail "stap timeout"; exec kill -INT -[exp_pid -i $stap_id] } eof { set failed 0 } } - closewait -i $stap_id + catch {close -i $stap_id} + wait -i $stap_id if {$failed} { puts "whitelist_run failure \($detail\)" } } @@ -352,7 +353,7 @@ proc runbenchs {} { set donepos [lsearch $idlist $expect_out(spawn_id)] set idlist [lreplace $idlist $donepos $donepos] incr runningcount -1 - closewait -i $expect_out(spawn_id) + wait -i $expect_out(spawn_id) } timeout { break } |