Revert "testsuite: use catch{close}catch{wait} to ensure child process pipe/zombie cleanup"

This reverts commit 7938bd829dfd82c40b35d536b5913e666c1454d2.

13 files changed, 19 insertions, 17 deletions

diff --git a/testsuite/systemtap.samples/args.exp b/testsuite/systemtap.samples/args.exp
index 9cfc0d2b..6b1fd3d0 100644
--- a/testsuite/systemtap.samples/args.exp
+++ b/testsuite/systemtap.samples/args.exp
@@ -21,7 +21,7 @@ expect {
     timeout { fail "$test compile (timeout)" }
     eof { }
 }
-closewait
+catch {close}; wait
 
 set modpath_cwd "$modname.ko"
 if [file exists $modpath_cwd] {
@@ -55,7 +55,7 @@ expect {
     timeout { }
     eof { }
 }
-closewait
+catch {close}; wait
 if {$ok == 1} {
     pass "$test run 1"
 } else {
@@ -70,7 +70,7 @@ expect {
     timeout { }
     eof { }
 }
-closewait
+catch {close}; wait
 if {$ok == 1} {
     pass "$test run 2"
 } else {
diff --git a/testsuite/systemtap.samples/arith.exp b/testsuite/systemtap.samples/arith.exp
index f0af4db7..c4f72793 100644
--- a/testsuite/systemtap.samples/arith.exp
+++ b/testsuite/systemtap.samples/arith.exp
@@ -9,5 +9,6 @@ expect {
     timeout { fail "$test (timeout)" }
     eof { }
 }
-closewait
+close
+wait
 if {$ok == 1} { pass "$test" } { fail "$test" }
diff --git a/testsuite/systemtap.samples/arith_limits.exp b/testsuite/systemtap.samples/arith_limits.exp
index b8b3d3d8..93794c8e 100644
--- a/testsuite/systemtap.samples/arith_limits.exp
+++ b/testsuite/systemtap.samples/arith_limits.exp
@@ -9,5 +9,5 @@ expect {
     timeout { fail "$test (timeout)" }
     eof { }
 }
-closewait
+wait
 if {$ok == 1} { pass "$test" } { fail "$test" }
diff --git a/testsuite/systemtap.samples/crash.exp b/testsuite/systemtap.samples/crash.exp
index 453a510b..9c3e5e05 100644
--- a/testsuite/systemtap.samples/crash.exp
+++ b/testsuite/systemtap.samples/crash.exp
@@ -19,7 +19,7 @@ expect {
     timeout { fail "$test - testlog.stp timeout" }
     timeout { fail "$test - testlog.stp eof" }
 }
-catch { exec kill -INT -[exp_pid]; closewait }
+catch { exec kill -INT -[exp_pid]; close ; wait }
 
 # The crash(8) script creates testlog/global or testlog/cpu<n>
 as_root { chmod -R a+rX testlog }
diff --git a/testsuite/systemtap.samples/gtod.exp b/testsuite/systemtap.samples/gtod.exp
index 97aaca83..a8f3c9d6 100644
--- a/testsuite/systemtap.samples/gtod.exp
+++ b/testsuite/systemtap.samples/gtod.exp
@@ -16,7 +16,7 @@ expect {
 	timeout { fail "$test (timeout)" }
 	eof { }
 }
-closewait
+wait
 #10ms interval (check timer drift in middle range)
 spawn $srcdir/$subdir/gtod.sh $srcdir/$subdir/gtod.stp $wd/gtod 10000
 expect {
@@ -25,7 +25,7 @@ expect {
 	timeout { fail "$test (timeout)" }
 	eof { }
 }
-closewait
+wait
 #100ms interval (calm down processors and CPU freq might be changed)
 spawn $srcdir/$subdir/gtod.sh $srcdir/$subdir/gtod.stp $wd/gtod 100000
 expect {
@@ -34,7 +34,7 @@ expect {
 	timeout { fail "$test (timeout)" }
 	eof { }
 }
-closewait
+wait
 exec rm -f $wd/gtod
 if {$ok == 300} { pass "$test ($ok)" } { fail "$test ($ok)" }
 
diff --git a/testsuite/systemtap.samples/pfaults.exp b/testsuite/systemtap.samples/pfaults.exp
index bf50cd18..2cab7c14 100644
--- a/testsuite/systemtap.samples/pfaults.exp
+++ b/testsuite/systemtap.samples/pfaults.exp
@@ -12,5 +12,5 @@ expect {
     eof { }
 }
 #FIXME does not handle case of hanging pfaults.stp correctly
-closewait
+wait
 if {$ok == 2} { pass "$test ($ok)" } { fail "$test ($ok)" }
diff --git a/testsuite/systemtap.samples/poll_map.exp b/testsuite/systemtap.samples/poll_map.exp
index be999b49..5ade48e6 100644
--- a/testsuite/systemtap.samples/poll_map.exp
+++ b/testsuite/systemtap.samples/poll_map.exp
@@ -9,5 +9,6 @@ expect {
     timeout { fail "$test (timeout)" }
     eof { }
 }
-closewait
+close
+wait
 if {$ok == 1} { pass "$test ($ok)" } { fail "$test ($ok)" }
diff --git a/testsuite/systemtap.samples/primes.exp b/testsuite/systemtap.samples/primes.exp
index f5a734c3..f99f67cc 100644
--- a/testsuite/systemtap.samples/primes.exp
+++ b/testsuite/systemtap.samples/primes.exp
@@ -16,6 +16,6 @@ expect {
     eof { }
 }
 #FIXME does not handle case of hanging primes.stp correctly
-closewait
+wait
 
 if {$ok == 7} { pass "$test" } { fail "$test" }
diff --git a/testsuite/systemtap.samples/profile.exp b/testsuite/systemtap.samples/profile.exp
index da763053..87174d2c 100644
--- a/testsuite/systemtap.samples/profile.exp
+++ b/testsuite/systemtap.samples/profile.exp
@@ -10,6 +10,6 @@ expect {
     eof { }
 }
 #FIXME does not handle case of hanging primes.stp correctly
-closewait
+wait
 
 if {$ok > 0} { pass $test } { fail $test }
diff --git a/testsuite/systemtap.samples/symbols.exp b/testsuite/systemtap.samples/symbols.exp
index a3bad80a..0c599b58 100644
--- a/testsuite/systemtap.samples/symbols.exp
+++ b/testsuite/systemtap.samples/symbols.exp
@@ -10,5 +10,5 @@ expect {
     eof { }
 }
 #FIXME does not handle case of hanging symbols.stp correctly
-closewait
+wait
 if {$ok == 11} { pass "$test ($ok)" } { fail "$test ($ok)" }
diff --git a/testsuite/systemtap.samples/syscalls1.exp b/testsuite/systemtap.samples/syscalls1.exp
index e9998c14..eb8a0c6d 100644
--- a/testsuite/systemtap.samples/syscalls1.exp
+++ b/testsuite/systemtap.samples/syscalls1.exp
@@ -10,5 +10,5 @@ expect {
     eof { }
 }
 #FIXME does not handle case of hanging psyscalls.stp correctly
-closewait
+wait
 if {$ok > 200 && $ok < 350} { pass "$test ($ok)" } { fail "$test ($ok)" }
diff --git a/testsuite/systemtap.samples/syscalls2.exp b/testsuite/systemtap.samples/syscalls2.exp
index 0a171a75..7bbd9a51 100644
--- a/testsuite/systemtap.samples/syscalls2.exp
+++ b/testsuite/systemtap.samples/syscalls2.exp
@@ -9,7 +9,7 @@ expect {
     eof { }
 }
 #FIXME does not handle case of hanging psyscalls.stp correctly
-closewait
+wait
 # 150 is conservative - it's larger than 100 to allow a bit of slop
 # between the exit() call and the actual shutdown
 if {$ok >= 100 && $ok < 150} { pass "$test ($ok)" } { fail "$test ($ok)" }
diff --git a/testsuite/systemtap.samples/system_func.exp b/testsuite/systemtap.samples/system_func.exp
index 661815af..ec935783 100644
--- a/testsuite/systemtap.samples/system_func.exp
+++ b/testsuite/systemtap.samples/system_func.exp
@@ -18,5 +18,5 @@ expect {
     timeout { fail "$test (timeout)" }
     eof { }
 }
-closewait
+catch {close}; wait
 if {$open == 1 && $saw_user == 1 && $done == 1 } { pass "$test" } { fail "$test ($open,$saw_user,$done)" }