diff options
Diffstat (limited to 'testsuite/systemtap.base')
| -rw-r--r-- | testsuite/systemtap.base/cache.exp | 6 | ||||
| -rw-r--r-- | testsuite/systemtap.base/optim.exp | 2 | ||||
| -rw-r--r-- | testsuite/systemtap.base/overload.exp | 8 | ||||
| -rw-r--r-- | testsuite/systemtap.base/prologues.exp | 4 |
4 files changed, 14 insertions, 6 deletions
diff --git a/testsuite/systemtap.base/cache.exp b/testsuite/systemtap.base/cache.exp index 04da509b..c8084ec9 100644 --- a/testsuite/systemtap.base/cache.exp +++ b/testsuite/systemtap.base/cache.exp @@ -27,12 +27,14 @@ proc stap_compile { TEST_NAME flags script args } { set cached 0 set compile_errors 0 expect { - -re {^Pass\ [1234]:[^\r]*\ in\ .*\ ms.\r\n} {exp_continue} + -timeout 180 + -re {^Pass\ [1234]:[^\r]*\ in\ [^\r]*\ ms\.\r\n} {exp_continue} -re {^Pass\ [34]: using cached [^\r\n]+\r\n} {incr cached 1; exp_continue} # pass-4 output - -re {^/[^\r\n]+.ko\r\n} {exp_continue} + -re {^/[^\r\n]+\.ko\r\n} {exp_continue} -re "compilation failed" {incr compile_errors 1; exp_continue} -re "semantic error:" {incr compile_errors 1; exp_continue} + timeout { fail "$TEST_NAME (timeout)" } } catch close wait diff --git a/testsuite/systemtap.base/optim.exp b/testsuite/systemtap.base/optim.exp index 41e22d7a..23735af6 100644 --- a/testsuite/systemtap.base/optim.exp +++ b/testsuite/systemtap.base/optim.exp @@ -3,7 +3,7 @@ if {![installtest_p]} { untested $test; return } spawn stap $srcdir/$subdir/optim.stp set ok 0 expect { - -timeout 30 + -timeout 120 -re {i=1} { incr ok } timeout { fail "$test (timeout)" } eof { } diff --git a/testsuite/systemtap.base/overload.exp b/testsuite/systemtap.base/overload.exp index e713c7c5..db7f49ef 100644 --- a/testsuite/systemtap.base/overload.exp +++ b/testsuite/systemtap.base/overload.exp @@ -25,8 +25,9 @@ proc stap_run_overload { TEST_NAME EXPECT_OVERLOAD args } { set cmd [concat {stap -v} $args] eval spawn $cmd expect { - -re {^Pass\ [1234]: .+real\ ms.\r\n} {exp_continue} - -re {^Pass\ ([34]): using cached .+\r\n} {exp_continue} + -timeout 150 + -re {^Pass\ [1234]: [^\r]+real\ ms\.\r\n} {exp_continue} + -re {^Pass\ ([34]): using cached [^\r]+\r\n} {exp_continue} -re {^Pass 5: starting run.\r\n} {exp_continue} -re {ERROR: probe overhead exceeded threshold\r\n} { if {$EXPECT_OVERLOAD} { @@ -35,10 +36,11 @@ proc stap_run_overload { TEST_NAME EXPECT_OVERLOAD args } { fail "$TEST_NAME unexpected overload" } } - -timeout 30 -re "^systemtap starting probe\r\n" { + -re "^systemtap starting probe\r\n" { send "\003" expect { + -timeout 10 -re {^systemtap ending probe\r\n} { if {$EXPECT_OVERLOAD} { fail "$TEST_NAME didn't receive expected overload" diff --git a/testsuite/systemtap.base/prologues.exp b/testsuite/systemtap.base/prologues.exp index b0f6a5c6..48f994a5 100644 --- a/testsuite/systemtap.base/prologues.exp +++ b/testsuite/systemtap.base/prologues.exp @@ -3,8 +3,10 @@ if {! [installtest_p]} { untested $test } else { set ok 0 spawn stap -P $srcdir/$subdir/prologues.stp expect { + -timeout 240 -re {read[^\r\n]*\r\n} { incr ok; exp_continue } -re {write[^\r\n]*\r\n} { incr ok; exp_continue } + timeout { fail "$test (timeout)" } eof } wait @@ -16,8 +18,10 @@ if {! [installtest_p]} { untested $test } else { set ok 0 spawn stap $srcdir/$subdir/prologues.stp expect { + -timeout 240 -re {read[^\r\n]*\r\n} { incr ok; exp_continue } -re {write[^\r\n]*\r\n} { incr ok; exp_continue } + timeout { fail "$test (timeout)" } eof } wait |