From 60c9dcc116ce1832ff9ff0c235233c5a2db3e3cd Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Sat, 29 Aug 2009 16:29:27 +0200 Subject: Tighten alias_tapset.exp expect regexp to not gobble up multiple lines. --- testsuite/systemtap.base/alias_tapset.exp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'testsuite/systemtap.base') 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" } -- cgit