diff options
Diffstat (limited to 'testsuite/lib')
| -rw-r--r-- | testsuite/lib/stap_run.exp | 1 | ||||
| -rw-r--r-- | testsuite/lib/stap_run2.exp | 5 | ||||
| -rw-r--r-- | testsuite/lib/systemtap.exp | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/testsuite/lib/stap_run.exp b/testsuite/lib/stap_run.exp index 8b1c8eaa..018d2bf3 100644 --- a/testsuite/lib/stap_run.exp +++ b/testsuite/lib/stap_run.exp @@ -58,6 +58,7 @@ proc stap_run { TEST_NAME {LOAD_GEN_FUNCTION ""} {OUTPUT_CHECK_STRING ""} args } -re $output { pass "$TEST_NAME shutdown and output" expect { + -timeout -1 -re {^Pass\ ([5]):[^\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)" verbose -log "metric:\t$TEST_NAME $pass1$pass2$pass3$pass4$pass5"} diff --git a/testsuite/lib/stap_run2.exp b/testsuite/lib/stap_run2.exp index 254b4e5a..6c22e039 100644 --- a/testsuite/lib/stap_run2.exp +++ b/testsuite/lib/stap_run2.exp @@ -29,13 +29,14 @@ proc stap_run2 { TEST_NAME args } { -timeout 180 -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\n} + -re {^Pass\ ([34]): using cached [^\r]+\r\n} {set pass$expect_out(1,string) "\t0\t0\t0"; exp_continue} -re {^Pass 5: starting run.\r\n} {exp_continue} -ex $output { pass "$TEST_NAME" expect { - -re {^Pass\ ([5]):[^\r]*\ in\ ([0-9]+)usr/([0-9]+)sys/([0-9]+)real\ ms.\r\n} + -timeout 20 + -re {^Pass\ ([5]):[^\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)" verbose -log "metric:\t$TEST_NAME $pass1$pass2$pass3$pass4$pass5"} } diff --git a/testsuite/lib/systemtap.exp b/testsuite/lib/systemtap.exp index 46f4ada5..6c8ed540 100644 --- a/testsuite/lib/systemtap.exp +++ b/testsuite/lib/systemtap.exp @@ -82,9 +82,9 @@ proc stap_run_batch {args} { } expect { + -timeout -1 -re {[^\r]*\r} { verbose -log $expect_out(0,string); exp_continue } eof { } - timeout { exp_continue } } set results [wait] verbose -log "wait results: $results" |