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.maps | |
| 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.maps')
| -rw-r--r-- | testsuite/systemtap.maps/absentstats.exp | 3 | ||||
| -rw-r--r-- | testsuite/systemtap.maps/foreach_fail.exp | 3 | ||||
| -rw-r--r-- | testsuite/systemtap.maps/ix_clear.exp | 3 | ||||
| -rw-r--r-- | testsuite/systemtap.maps/ix_clear2.exp | 3 | ||||
| -rw-r--r-- | testsuite/systemtap.maps/ix_clear3.exp | 3 | ||||
| -rw-r--r-- | testsuite/systemtap.maps/linear_0.exp | 3 | ||||
| -rw-r--r-- | testsuite/systemtap.maps/linear_bad.exp | 3 | ||||
| -rw-r--r-- | testsuite/systemtap.maps/linear_neg.exp | 3 | ||||
| -rw-r--r-- | testsuite/systemtap.maps/pmap_agg_overflow.exp | 3 |
9 files changed, 18 insertions, 9 deletions
diff --git a/testsuite/systemtap.maps/absentstats.exp b/testsuite/systemtap.maps/absentstats.exp index d533d2fa..f0e99a86 100644 --- a/testsuite/systemtap.maps/absentstats.exp +++ b/testsuite/systemtap.maps/absentstats.exp @@ -17,6 +17,7 @@ expect { -re {\n} { exp_continue } eof { } } -closewait +catch close +wait if {$ok == 2 && $ko == 13} then { pass $test } else { fail "$test ($ok $ko)" } diff --git a/testsuite/systemtap.maps/foreach_fail.exp b/testsuite/systemtap.maps/foreach_fail.exp index 934a58cd..75fcfcc4 100644 --- a/testsuite/systemtap.maps/foreach_fail.exp +++ b/testsuite/systemtap.maps/foreach_fail.exp @@ -14,4 +14,5 @@ expect { fail "$test unexpected EOF" } -re "semantic error:" { pass "$test correctly failed to compile" } } -closewait +close +wait diff --git a/testsuite/systemtap.maps/ix_clear.exp b/testsuite/systemtap.maps/ix_clear.exp index b88e92f5..07417898 100644 --- a/testsuite/systemtap.maps/ix_clear.exp +++ b/testsuite/systemtap.maps/ix_clear.exp @@ -21,4 +21,5 @@ expect { fail "$test unexpected EOF" } -re "semantic error:" { fail "$test compilation" } } -closewait +catch { close } +wait diff --git a/testsuite/systemtap.maps/ix_clear2.exp b/testsuite/systemtap.maps/ix_clear2.exp index 280650c0..a1b68628 100644 --- a/testsuite/systemtap.maps/ix_clear2.exp +++ b/testsuite/systemtap.maps/ix_clear2.exp @@ -22,4 +22,5 @@ expect { fail "$test unexpected EOF" } -re "semantic error:" { fail "$test compilation" } } -closewait +catch { close } +wait diff --git a/testsuite/systemtap.maps/ix_clear3.exp b/testsuite/systemtap.maps/ix_clear3.exp index c0a61af1..a2935470 100644 --- a/testsuite/systemtap.maps/ix_clear3.exp +++ b/testsuite/systemtap.maps/ix_clear3.exp @@ -20,4 +20,5 @@ expect { fail "$test unexpected EOF" } -re "semantic error:" { fail "$test compilation" } } -closewait +catch { close } +wait diff --git a/testsuite/systemtap.maps/linear_0.exp b/testsuite/systemtap.maps/linear_0.exp index efb97066..8e6952a7 100644 --- a/testsuite/systemtap.maps/linear_0.exp +++ b/testsuite/systemtap.maps/linear_0.exp @@ -15,7 +15,8 @@ expect { } eof { } } -closewait +catch close +wait if {$ok == 1} { pass $test diff --git a/testsuite/systemtap.maps/linear_bad.exp b/testsuite/systemtap.maps/linear_bad.exp index a093cb49..d99fd16c 100644 --- a/testsuite/systemtap.maps/linear_bad.exp +++ b/testsuite/systemtap.maps/linear_bad.exp @@ -15,7 +15,8 @@ expect { } eof { } } -closewait +catch close +wait if {$ok == 1} { pass $test diff --git a/testsuite/systemtap.maps/linear_neg.exp b/testsuite/systemtap.maps/linear_neg.exp index bad6ad21..b1640030 100644 --- a/testsuite/systemtap.maps/linear_neg.exp +++ b/testsuite/systemtap.maps/linear_neg.exp @@ -15,7 +15,8 @@ expect { } eof { } } -closewait +catch close +wait if {$ok == 1} { pass $test diff --git a/testsuite/systemtap.maps/pmap_agg_overflow.exp b/testsuite/systemtap.maps/pmap_agg_overflow.exp index edb605e7..99665057 100644 --- a/testsuite/systemtap.maps/pmap_agg_overflow.exp +++ b/testsuite/systemtap.maps/pmap_agg_overflow.exp @@ -25,7 +25,8 @@ expect { eof {} -re "semantic error:" { fail "$test compilation" } } -closewait +catch { close } +wait if {$pass == 3} { pass $test |