From 8404e6184256e2d580cbd1c97cb5859c625b99f7 Mon Sep 17 00:00:00 2001
From: "Frank Ch. Eigler" <fche@elastic.org>
Date: Wed, 28 May 2008 08:15:57 -0400
Subject: Revert "testsuite: use catch{close}catch{wait} to ensure child
 process pipe/zombie cleanup" This reverts commit
 7938bd829dfd82c40b35d536b5913e666c1454d2.

---
 testsuite/lib/stap_run.exp  | 3 ++-
 testsuite/lib/systemtap.exp | 5 -----
 2 files changed, 2 insertions(+), 6 deletions(-)

(limited to 'testsuite/lib')

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 }
-}
-- 
cgit