From 53de687e0ca376db7ff55219833542982e477900 Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Sat, 23 Feb 2008 15:36:53 -0500 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/systemtap.base/onoffprobe.exp | 2 +- testsuite/systemtap.base/overload.exp | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'testsuite/systemtap.base') diff --git a/testsuite/systemtap.base/onoffprobe.exp b/testsuite/systemtap.base/onoffprobe.exp index b86de4ea..24012cac 100644 --- a/testsuite/systemtap.base/onoffprobe.exp +++ b/testsuite/systemtap.base/onoffprobe.exp @@ -32,7 +32,7 @@ expect { timeout { fail "$test (timeout)" } eof { } } -send "\003" +exec kill -INT -[exp_pid] #FIXME does not handle case of hanging pfaults.stp correctly wait exec rm -f $test.ko diff --git a/testsuite/systemtap.base/overload.exp b/testsuite/systemtap.base/overload.exp index db7f49ef..cbcbe817 100644 --- a/testsuite/systemtap.base/overload.exp +++ b/testsuite/systemtap.base/overload.exp @@ -37,7 +37,7 @@ proc stap_run_overload { TEST_NAME EXPECT_OVERLOAD args } { } } -re "^systemtap starting probe\r\n" { - send "\003" + exec kill -INT -[exp_pid] expect { -timeout 10 @@ -58,7 +58,8 @@ proc stap_run_overload { TEST_NAME EXPECT_OVERLOAD 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