From 7938bd829dfd82c40b35d536b5913e666c1454d2 Mon Sep 17 00:00:00 2001
From: "Frank Ch. Eigler" <fche@elastic.org>
Date: Tue, 27 May 2008 17:40:00 -0400
Subject: testsuite: use catch{close}catch{wait} to ensure child process
 pipe/zombie cleanup

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

(limited to 'testsuite/lib')

diff --git a/testsuite/lib/stap_run.exp b/testsuite/lib/stap_run.exp
index 42efa4f8..aa681c22 100644
--- a/testsuite/lib/stap_run.exp
+++ b/testsuite/lib/stap_run.exp
@@ -90,8 +90,7 @@ proc stap_run { TEST_NAME {LOAD_GEN_FUNCTION ""} {OUTPUT_CHECK_STRING ""} args }
     }
   # again for good measure
   exec kill -INT -[exp_pid]
-  catch close
-  wait
+  closewait
 }
 
 proc no_load {} {
diff --git a/testsuite/lib/systemtap.exp b/testsuite/lib/systemtap.exp
index d458e98f..4586ee20 100644
--- a/testsuite/lib/systemtap.exp
+++ b/testsuite/lib/systemtap.exp
@@ -128,3 +128,8 @@ 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