diff options
| author | Frank Ch. Eigler <fche@elastic.org> | 2008-03-25 11:32:58 -0400 |
|---|---|---|
| committer | Frank Ch. Eigler <fche@elastic.org> | 2008-03-25 11:32:58 -0400 |
| commit | aaf2af3e3b0c159a64609c82811662d7253c3a96 (patch) | |
| tree | 6483a96d2adabed2f34508a02882ca9d2de22b01 /testsuite/lib/stap_run.exp | |
| parent | 481963c741b440fec7724426f12b268cfad199b3 (diff) | |
| download | systemtap-steved-aaf2af3e3b0c159a64609c82811662d7253c3a96.tar.gz systemtap-steved-aaf2af3e3b0c159a64609c82811662d7253c3a96.tar.xz systemtap-steved-aaf2af3e3b0c159a64609c82811662d7253c3a96.zip | |
rebased unwind_branch on top of current master
Diffstat (limited to 'testsuite/lib/stap_run.exp')
| -rw-r--r-- | testsuite/lib/stap_run.exp | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/testsuite/lib/stap_run.exp b/testsuite/lib/stap_run.exp index 42efa4f8..c2b4e74d 100644 --- a/testsuite/lib/stap_run.exp +++ b/testsuite/lib/stap_run.exp @@ -34,7 +34,6 @@ 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} @@ -74,22 +73,15 @@ 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)" - exec kill -INT -[exp_pid] - } + timeout { fail "$TEST_NAME shutdown (timeout)" } 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 } |