diff options
| author | Frank Ch. Eigler <fche@elastic.org> | 2008-05-27 17:40:00 -0400 |
|---|---|---|
| committer | Frank Ch. Eigler <fche@elastic.org> | 2008-05-27 17:43:04 -0400 |
| commit | 7938bd829dfd82c40b35d536b5913e666c1454d2 (patch) | |
| tree | 2022964dca31d53b6eee3fe9588e955c410ec53e /testsuite/systemtap.stress | |
| parent | 16a02dfb97fd3979d0f517a71a6aba050a3bed98 (diff) | |
| download | systemtap-steved-7938bd829dfd82c40b35d536b5913e666c1454d2.tar.gz systemtap-steved-7938bd829dfd82c40b35d536b5913e666c1454d2.tar.xz systemtap-steved-7938bd829dfd82c40b35d536b5913e666c1454d2.zip | |
testsuite: use catch{close}catch{wait} to ensure child process pipe/zombie cleanup
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, 3 insertions, 4 deletions
diff --git a/testsuite/systemtap.stress/conversions.exp b/testsuite/systemtap.stress/conversions.exp index 9c2c2fa9..89d89250 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" - wait + closewait 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 4a31c124..f7c0bf16 100644 --- a/testsuite/systemtap.stress/whitelist.exp +++ b/testsuite/systemtap.stress/whitelist.exp @@ -320,8 +320,7 @@ 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 } } - catch {close -i $stap_id} - wait -i $stap_id + closewait -i $stap_id if {$failed} { puts "whitelist_run failure \($detail\)" } } @@ -353,7 +352,7 @@ proc runbenchs {} { set donepos [lsearch $idlist $expect_out(spawn_id)] set idlist [lreplace $idlist $donepos $donepos] incr runningcount -1 - wait -i $expect_out(spawn_id) + closewait -i $expect_out(spawn_id) } timeout { break } |