diff options
| author | Frank Ch. Eigler <fche@elastic.org> | 2008-02-23 15:36:53 -0500 |
|---|---|---|
| committer | Frank Ch. Eigler <fche@elastic.org> | 2008-02-23 15:36:53 -0500 |
| commit | 53de687e0ca376db7ff55219833542982e477900 (patch) | |
| tree | e9695c1a4defeacde66d53ea7d473b980cad2346 /testsuite/systemtap.base | |
| parent | b82961aac5cf401b2fbd52970cd28766b026d0aa (diff) | |
| download | systemtap-steved-53de687e0ca376db7ff55219833542982e477900.tar.gz systemtap-steved-53de687e0ca376db7ff55219833542982e477900.tar.xz systemtap-steved-53de687e0ca376db7ff55219833542982e477900.zip | |
PR5770: false systemtap/eof/timeout messages in testsuite.log
2008-02-23 Frank Ch. Eigler <fche@elastic.org>
* */*.exp: Change all "send \003" to "exec kill -INT -<pgrp>" in order
to more reliably kill an inferior stap/stapio/staprun process group.
Diffstat (limited to 'testsuite/systemtap.base')
| -rw-r--r-- | testsuite/systemtap.base/onoffprobe.exp | 2 | ||||
| -rw-r--r-- | testsuite/systemtap.base/overload.exp | 5 |
2 files changed, 4 insertions, 3 deletions
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 |