From 4e14d2355434bef975d1e2a1ea05c1a159fcecde Mon Sep 17 00:00:00 2001 From: fche Date: Sat, 23 Feb 2008 20:37:18 +0000 Subject: PR5770: false systemtap/eof/timeout messages in testsuite.log 2008-02-23 Frank Ch. Eigler * */*.exp: Change all "send \003" to "exec kill -INT -" in order to more reliably kill an inferior stap/stapio/staprun process group. --- testsuite/lib/stap_run.exp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'testsuite/lib') diff --git a/testsuite/lib/stap_run.exp b/testsuite/lib/stap_run.exp index 5bd1549c..c2b4e74d 100644 --- a/testsuite/lib/stap_run.exp +++ b/testsuite/lib/stap_run.exp @@ -50,7 +50,7 @@ proc stap_run { TEST_NAME {LOAD_GEN_FUNCTION ""} {OUTPUT_CHECK_STRING ""} args } } } - send "\003" + exec kill -INT -[exp_pid] # check the output to see if it is sane set output "^systemtap ending probe\r\n$OUTPUT_CHECK_STRING" @@ -78,7 +78,8 @@ proc stap_run { TEST_NAME {LOAD_GEN_FUNCTION ""} {OUTPUT_CHECK_STRING ""} args } } } -re "semantic error:" { fail "$TEST_NAME compilation" } - timeout { fail "$TEST_NAME startup (timeout)"; send "\003" } + timeout { fail "$TEST_NAME startup (timeout)" + exec kill -INT [exp_pid] } eof { fail "$TEST_NAME startup (eof)" } } catch close -- cgit