diff options
| author | Frank Ch. Eigler <fche@elastic.org> | 2008-05-28 08:15:57 -0400 |
|---|---|---|
| committer | Frank Ch. Eigler <fche@elastic.org> | 2008-05-28 08:15:57 -0400 |
| commit | 8404e6184256e2d580cbd1c97cb5859c625b99f7 (patch) | |
| tree | 562347b5d8626fd99f7b94e33c24e619753330f0 /testsuite/systemtap.stress/whitelist.exp | |
| parent | a2eab6ee228991f3ebfa5f628857ec6c703c85d1 (diff) | |
| download | systemtap-steved-8404e6184256e2d580cbd1c97cb5859c625b99f7.tar.gz systemtap-steved-8404e6184256e2d580cbd1c97cb5859c625b99f7.tar.xz systemtap-steved-8404e6184256e2d580cbd1c97cb5859c625b99f7.zip | |
Revert "testsuite: use catch{close}catch{wait} to ensure child process pipe/zombie cleanup"
This reverts commit 7938bd829dfd82c40b35d536b5913e666c1454d2.
Diffstat (limited to 'testsuite/systemtap.stress/whitelist.exp')
| -rw-r--r-- | testsuite/systemtap.stress/whitelist.exp | 5 |
1 files changed, 3 insertions, 2 deletions
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 } |