summaryrefslogtreecommitdiffstats
path: root/testsuite/lib
diff options
context:
space:
mode:
Diffstat (limited to 'testsuite/lib')
-rw-r--r--testsuite/lib/stap_run.exp3
-rw-r--r--testsuite/lib/systemtap.exp5
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 }
-}