diff options
| author | fche <fche> | 2008-03-23 23:01:43 +0000 |
|---|---|---|
| committer | Frank Ch. Eigler <fche@elastic.org> | 2008-03-25 11:53:13 -0400 |
| commit | 874381d3fc30dddd9f8584f3f6a9a36a1a4ad9df (patch) | |
| tree | 210166f1703d0ffa91d462c729add24a33d7b490 | |
| parent | 44169f5dbcf16072c38a762f0c352601cb2133a7 (diff) | |
| download | systemtap-steved-874381d3fc30dddd9f8584f3f6a9a36a1a4ad9df.tar.gz systemtap-steved-874381d3fc30dddd9f8584f3f6a9a36a1a4ad9df.tar.xz systemtap-steved-874381d3fc30dddd9f8584f3f6a9a36a1a4ad9df.zip | |
2008-03-23 Frank Ch. Eigler <fche@elastic.org>
* lib/stap_run.exp (stap_run): Ignore missing debuginfo warnings.
Try harder to kill stap child in case of timeouts and errors.
(cherry picked from commit ef859360e89d32801e37ddecf59ceee20a049391)
| -rw-r--r-- | testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | testsuite/lib/stap_run.exp | 14 |
2 files changed, 16 insertions, 3 deletions
diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog index 628cb9a7..a54e80bd 100644 --- a/testsuite/ChangeLog +++ b/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2008-03-23 Frank Ch. Eigler <fche@elastic.org> + * lib/stap_run.exp (stap_run): Ignore missing debuginfo warnings. + Try harder to kill stap child in case of timeouts and errors. + +2008-03-23 Frank Ch. Eigler <fche@elastic.org> + PR 5980. * lib/systemtap.exp: Set default Snapshot: value from "stap -V" output. diff --git a/testsuite/lib/stap_run.exp b/testsuite/lib/stap_run.exp index c2b4e74d..42efa4f8 100644 --- a/testsuite/lib/stap_run.exp +++ b/testsuite/lib/stap_run.exp @@ -34,6 +34,7 @@ proc stap_run { TEST_NAME {LOAD_GEN_FUNCTION ""} {OUTPUT_CHECK_STRING ""} args } expect { -timeout 180 -re {^Warning: using '-m' disables cache support.\r\n} {exp_continue} + -re {^WARNING: cannot find module [^\r]*DWARF[^\r]*\r\n} {exp_continue} -re {^Pass\ ([1234]):[^\r]*\ in\ ([0-9]+)usr/([0-9]+)sys/([0-9]+)real\ ms\.\r\n} {set pass$expect_out(1,string) "\t$expect_out(2,string)\t$expect_out(3,string)\t$expect_out(4,string)"; exp_continue} -re {^Pass\ ([34]): using cached [^\r]+\r\n} @@ -73,15 +74,22 @@ proc stap_run { TEST_NAME {LOAD_GEN_FUNCTION ""} {OUTPUT_CHECK_STRING ""} args } set skipped_probes $expect_out(2,string)} } } - timeout { fail "$TEST_NAME shutdown (timeout)" } + timeout { + fail "$TEST_NAME shutdown (timeout)" + exec kill -INT -[exp_pid] + } eof { fail "$TEST_NAME shutdown (eof)" } } } -re "semantic error:" { fail "$TEST_NAME compilation" } - timeout { fail "$TEST_NAME startup (timeout)" - exec kill -INT [exp_pid] } + timeout { + fail "$TEST_NAME startup (timeout)" + exec kill -INT -[exp_pid] + } eof { fail "$TEST_NAME startup (eof)" } } + # again for good measure + exec kill -INT -[exp_pid] catch close wait } |