diff options
| author | Mark Wielaard <mjw@redhat.com> | 2009-08-29 16:29:27 +0200 |
|---|---|---|
| committer | Mark Wielaard <mjw@redhat.com> | 2009-08-29 16:29:27 +0200 |
| commit | 60c9dcc116ce1832ff9ff0c235233c5a2db3e3cd (patch) | |
| tree | 909537e183a418927ec2a2b0ef3811692a8aa931 | |
| parent | 8d7a7bd9456c6067e874dabf6ee08b0a4e0de7d0 (diff) | |
| download | systemtap-steved-60c9dcc116ce1832ff9ff0c235233c5a2db3e3cd.tar.gz systemtap-steved-60c9dcc116ce1832ff9ff0c235233c5a2db3e3cd.tar.xz systemtap-steved-60c9dcc116ce1832ff9ff0c235233c5a2db3e3cd.zip | |
Tighten alias_tapset.exp expect regexp to not gobble up multiple lines.
| -rw-r--r-- | testsuite/systemtap.base/alias_tapset.exp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/testsuite/systemtap.base/alias_tapset.exp b/testsuite/systemtap.base/alias_tapset.exp index 479da384..b5e39400 100644 --- a/testsuite/systemtap.base/alias_tapset.exp +++ b/testsuite/systemtap.base/alias_tapset.exp @@ -12,10 +12,10 @@ verbose -log "running $cmd" eval spawn $cmd expect { -timeout 60 - -re {^never.+\r\n} { incr never_found; exp_continue } - -re {^kernel.function.+\r\n} { incr kernel_function_found; exp_continue } - -re {^timer.+\r\n} { incr timer_found; exp_continue } - -re {^.+\r\n} { + -re {^never[^\r\n]+\r\n} { incr never_found; exp_continue } + -re {^kernel[^\r\n]function.+\r\n} { incr kernel_function_found; exp_continue } + -re {^timer[^\r\n]+\r\n} { incr timer_found; exp_continue } + -re {^[^\r\n]+\r\n} { # ignore output we're not interested in exp_continue } timeout { verbose -log "TIMEOUT" } |