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/lib | |
| 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/lib')
| -rw-r--r-- | testsuite/lib/stap_run.exp | 3 | ||||
| -rw-r--r-- | testsuite/lib/systemtap.exp | 5 |
2 files changed, 2 insertions, 6 deletions
diff --git a/testsuite/lib/stap_run.exp b/testsuite/lib/stap_run.exp index aa681c22..42efa4f8 100644 --- a/testsuite/lib/stap_run.exp +++ b/testsuite/lib/stap_run.exp @@ -90,7 +90,8 @@ proc stap_run { TEST_NAME {LOAD_GEN_FUNCTION ""} {OUTPUT_CHECK_STRING ""} args } } # again for good measure exec kill -INT -[exp_pid] - closewait + catch close + wait } proc no_load {} { diff --git a/testsuite/lib/systemtap.exp b/testsuite/lib/systemtap.exp index 4586ee20..d458e98f 100644 --- a/testsuite/lib/systemtap.exp +++ b/testsuite/lib/systemtap.exp @@ -128,8 +128,3 @@ proc as_root { command } { verbose -log "RC $res" return $res } - -proc closewait { args } { - catch { if {"$args" == "" } then { close -slave } else { eval "close $args" } } - catch { wait } -} |