15 files changed, 30 insertions, 25 deletions
diff --git a/testsuite/systemtap.base/beginenderror.exp b/testsuite/systemtap.base/beginenderror.exp
index b43a900d..1ab50fdb 100644
--- a/testsuite/systemtap.base/beginenderror.exp
+++ b/testsuite/systemtap.base/beginenderror.exp
@@ -15,7 +15,7 @@ expect {
     timeout { fail "$test (timeout)" }
     eof { }
 }
-closewait
+wait
 if {$ok1 == 4 && $ok2 == 3 && $ko == 0} then {
     pass "$test ($ok1 $ok2 $ko)"
 } else {
diff --git a/testsuite/systemtap.base/bench.exp b/testsuite/systemtap.base/bench.exp
index 32de9a0b..4863a00c 100644
--- a/testsuite/systemtap.base/bench.exp
+++ b/testsuite/systemtap.base/bench.exp
@@ -10,5 +10,5 @@ expect {
     timeout { fail "$test (timeout)" }
     eof { }
 }
-closewait
+wait
 if {$ok == 15} { pass "$test ($ok)" } { fail "$test ($ok)" }
diff --git a/testsuite/systemtap.base/cache.exp b/testsuite/systemtap.base/cache.exp
index a908910a..26d7b0ef 100644
--- a/testsuite/systemtap.base/cache.exp
+++ b/testsuite/systemtap.base/cache.exp
@@ -36,7 +36,8 @@ proc stap_compile { TEST_NAME flags script args } {
 	-re "semantic error:" {incr compile_errors 1; exp_continue}
 	timeout { fail "$TEST_NAME (timeout)" }
     }
-    closewait
+    catch close
+    wait
 
     # If we've got compile errors and the script was supposed to
     # compile, fail.
diff --git a/testsuite/systemtap.base/cmd_parse.exp b/testsuite/systemtap.base/cmd_parse.exp
index 9fcad31a..cbce0455 100644
--- a/testsuite/systemtap.base/cmd_parse.exp
+++ b/testsuite/systemtap.base/cmd_parse.exp
@@ -13,7 +13,7 @@ expect {
     timeout {fail "cmd_parse1: unexpected timeout"}
     eof {fail "cmd_parse1: unexpected EOF"}
 }
-closewait
+wait
 
 # stap -c 'echo "hello "\"world\"' -e 'probe begin {}'
 spawn stap -c {echo "hello "\"world\"} -e {probe begin {}}
@@ -23,7 +23,7 @@ expect {
     timeout {fail "cmd_parse2: unexpected timeout"}
     eof {fail "cmd_parse2: unexpected EOF"}
 }
-closewait
+wait
 
 #stap -c '(a="hello world"; echo $a)' -e 'probe begin {}'
 spawn stap -c {(a="hello world"; echo $a)} -e {probe begin {}}
@@ -33,7 +33,7 @@ expect {
     timeout {fail "cmd_parse3: unexpected timeout"}
     eof {fail "cmd_parse3: unexpected EOF"}
 }
-closewait
+wait
 
 #stap -c '(a="hello "\"world\"; echo $a)' -e 'probe begin {}'
 spawn stap -c {(a="hello "\"world\"; echo $a)} -e {probe begin {}}
@@ -43,7 +43,7 @@ expect {
     timeout {fail "cmd_parse4: unexpected timeout"}
     eof {fail "cmd_parse4: unexpected EOF"}
 }
-closewait
+wait
 
 #stap -c '(a="hello "world; echo $a)' -e 'probe begin {}'
 spawn stap -c {(a="hello "world; echo $a)} -e {probe begin {}}
@@ -53,7 +53,7 @@ expect {
     timeout {fail "cmd_parse5: unexpected timeout"}
     eof {fail "cmd_parse5: unexpected EOF"}
 }
-closewait
+wait
 
 #stap -c '(((a=42+7)); echo "The answer is $a")' -e 'probe begin {}'
 # NB: not  ((a=42+7)) - must not assume bash
@@ -64,7 +64,7 @@ expect {
     timeout {fail "cmd_parse6: unexpected timeout"}
     eof {fail "cmd_parse6: unexpected EOF"}
 }
-closewait
+wait
 
 #stap -c '(echo "Hello World" 1>&2) > /dev/null' -e 'probe begin {}'
 spawn stap -c {(echo "Hello World" 1>&2) > /dev/null} -e {probe begin {}}
@@ -74,7 +74,7 @@ expect {
     timeout {fail "cmd_parse7: unexpected timeout"}
     eof {fail "cmd_parse7: unexpected EOF"}
 }
-closewait
+wait
 
 spawn stap -l {vm.*}
 expect {
@@ -83,4 +83,4 @@ expect {
     timeout {fail "cmd_parse8: unexpected timeout"}
     eof {fail "cmd_parse8: unexpected EOF"}
 }
-closewait
+wait
diff --git a/testsuite/systemtap.base/debugpath.exp b/testsuite/systemtap.base/debugpath.exp
index a3b3b051..b0b12207 100644
--- a/testsuite/systemtap.base/debugpath.exp
+++ b/testsuite/systemtap.base/debugpath.exp
@@ -7,7 +7,7 @@ expect {
 	eof { fail "$test (eof)" }
 }
 
-closewait
+wait
 
 set test "debugpath-good"
 spawn env SYSTEMTAP_DEBUGINFO_PATH=:/usr/lib/debug stap -e "probe kernel.function(\"sys_open\") {}" -p2
@@ -17,4 +17,4 @@ expect {
 	eof { fail "$test (eof)" }
 }
 
-closewait
+wait
diff --git a/testsuite/systemtap.base/deref2.exp b/testsuite/systemtap.base/deref2.exp
index b897fad8..6ee85d10 100644
--- a/testsuite/systemtap.base/deref2.exp
+++ b/testsuite/systemtap.base/deref2.exp
@@ -24,6 +24,6 @@ expect {
     eof { }
     timeout { }
 }
-closewait
+wait
 
 if {$neg > 0} { pass "$test ($pos $neg)" } else { fail "$test ($pos $neg)" }
diff --git a/testsuite/systemtap.base/marker.exp b/testsuite/systemtap.base/marker.exp
index 60a48b80..857fa5d2 100644
--- a/testsuite/systemtap.base/marker.exp
+++ b/testsuite/systemtap.base/marker.exp
@@ -23,7 +23,8 @@ proc stap_compile { TEST_NAME compile script args } {
 	-re "compilation failed" {incr compile_errors 1; exp_continue}
 	-re "semantic error:" {incr compile_errors 1; exp_continue}
     }
-    closewait
+    catch close
+    wait
 
     # If we've got compile errors and the script was supposed to
     # compile, fail.
diff --git a/testsuite/systemtap.base/onoffprobe.exp b/testsuite/systemtap.base/onoffprobe.exp
index 8e53ad45..24012cac 100644
--- a/testsuite/systemtap.base/onoffprobe.exp
+++ b/testsuite/systemtap.base/onoffprobe.exp
@@ -34,7 +34,7 @@ expect {
 }
 exec kill -INT -[exp_pid]
 #FIXME does not handle case of hanging pfaults.stp correctly
-closewait
+wait
 exec rm -f $test.ko
 if {$ok != 8} {fail "conditional probes ($ok)"}
 
diff --git a/testsuite/systemtap.base/optim.exp b/testsuite/systemtap.base/optim.exp
index 2d7b2bf7..ddc1c90f 100644
--- a/testsuite/systemtap.base/optim.exp
+++ b/testsuite/systemtap.base/optim.exp
@@ -9,5 +9,6 @@ expect {
 	timeout { fail "$test (timeout)" }
 	eof { }
 }
-closewait
+close
+wait
 if {$ok == 2} { pass $test } { fail $test }
diff --git a/testsuite/systemtap.base/overload.exp b/testsuite/systemtap.base/overload.exp
index de9382d2..cbcbe817 100644
--- a/testsuite/systemtap.base/overload.exp
+++ b/testsuite/systemtap.base/overload.exp
@@ -62,7 +62,8 @@ proc stap_run_overload { TEST_NAME EXPECT_OVERLOAD args } {
    	          exec kill -INT -[exp_pid] }
 	eof { fail "$TEST_NAME startup (eof)" }
     }
-    closewait
+    catch close
+    wait
 }
 
 # OVERLOAD1 tests to make sure normal operation doesn't receive an
diff --git a/testsuite/systemtap.base/preprocessor.exp b/testsuite/systemtap.base/preprocessor.exp
index e210cf4f..4e0c7fc2 100644
--- a/testsuite/systemtap.base/preprocessor.exp
+++ b/testsuite/systemtap.base/preprocessor.exp
@@ -48,5 +48,5 @@ expect {
     eof { }
     timeout { }
 }
-closewait
+catch {close; wait}
 if {$ok == 1} { pass $test } { fail $test }
diff --git a/testsuite/systemtap.base/prologues.exp b/testsuite/systemtap.base/prologues.exp
index 505b9836..48f994a5 100644
--- a/testsuite/systemtap.base/prologues.exp
+++ b/testsuite/systemtap.base/prologues.exp
@@ -9,7 +9,7 @@ if {! [installtest_p]} { untested $test } else {
         timeout { fail "$test (timeout)" }
         eof
     }
-    closewait
+    wait
     if {$ok > 10} { pass $test } else { fail $test }
 }
 
@@ -24,7 +24,7 @@ if {! [installtest_p]} { untested $test } else {
         timeout { fail "$test (timeout)" }
         eof
     }
-    closewait
+    wait
     if {$ok > 10} { pass $test } else { fail $test }
 }
 
diff --git a/testsuite/systemtap.base/stmtvars.exp b/testsuite/systemtap.base/stmtvars.exp
index abc85478..822e0d7e 100644
--- a/testsuite/systemtap.base/stmtvars.exp
+++ b/testsuite/systemtap.base/stmtvars.exp
@@ -10,7 +10,7 @@ expect {
     timeout { fail "$test (timeout)" }
     eof
     }
-closewait
+wait
 verbose -log "pc=$pc vars=$vars"
 if {$pc != 0 && $vars != ""} { pass "$test - .function" } { fail "$test - .function" }
 
@@ -23,7 +23,7 @@ expect {
     timeout { fail "$test (timeout)" }
     eof
     }
-closewait
+wait
 
 verbose -log "pc2=$pc2 vars2=$vars2"
 if {$pc == $pc2 && $vars == $vars2} { pass $test } { fail $test }
diff --git a/testsuite/systemtap.base/utrace_p4.exp b/testsuite/systemtap.base/utrace_p4.exp
index df877056..eb6ea685 100644
--- a/testsuite/systemtap.base/utrace_p4.exp
+++ b/testsuite/systemtap.base/utrace_p4.exp
@@ -26,7 +26,8 @@ proc stap_compile { TEST_NAME compile script args } {
 	-re "compilation failed" {incr compile_errors 1; exp_continue}
 	-re "semantic error:" {incr compile_errors 1; exp_continue}
     }
-    closewait
+    catch close
+    wait
 
     # If we've got compile errors and the script was supposed to
     # compile, fail.
diff --git a/testsuite/systemtap.base/warnings.exp b/testsuite/systemtap.base/warnings.exp
index 1e33138f..6cff723d 100644
--- a/testsuite/systemtap.base/warnings.exp
+++ b/testsuite/systemtap.base/warnings.exp
@@ -8,7 +8,7 @@ expect {
     timeout { fail "$test (timeout)" }
     eof { }
 }
-closewait
+wait
 if {$ok == 22} {
     pass $test
 } else {