summaryrefslogtreecommitdiffstats
path: root/testsuite/systemtap.base/labels.exp
diff options
context:
space:
mode:
authorDave Brolley <brolley@redhat.com>2009-09-17 20:36:24 -0400
committerDave Brolley <brolley@redhat.com>2009-09-17 20:36:24 -0400
commit762684a57fa5420cc122b475f592545e8eeb29cd (patch)
treec1b55657f1aff31e7298d76852bbe8522a84db13 /testsuite/systemtap.base/labels.exp
parent8afee8bbf045e858dae186d40653293c99dbbcdd (diff)
parent6bde4f381475cea055352d8ad5f60bb2f24de21d (diff)
downloadsystemtap-steved-762684a57fa5420cc122b475f592545e8eeb29cd.tar.gz
systemtap-steved-762684a57fa5420cc122b475f592545e8eeb29cd.tar.xz
systemtap-steved-762684a57fa5420cc122b475f592545e8eeb29cd.zip
Merge branch 'master' of ssh://sources.redhat.com/git/systemtap
Diffstat (limited to 'testsuite/systemtap.base/labels.exp')
-rw-r--r--testsuite/systemtap.base/labels.exp11
1 files changed, 9 insertions, 2 deletions
diff --git a/testsuite/systemtap.base/labels.exp b/testsuite/systemtap.base/labels.exp
index 79e3f483..f759beef 100644
--- a/testsuite/systemtap.base/labels.exp
+++ b/testsuite/systemtap.base/labels.exp
@@ -93,12 +93,19 @@ wait
set ok 0
expect {
-timeout 180
- -re {process.*function.*labels.c:5...label..init_an_int.*process.*function.*labels.c:16...label..init_an_int.*process.*function.*labels.c:18...label..init_an_int_again} { incr ok; exp_continue }
+ -re {^process[^\r\n]*function[^\r\n]*labels.c:5...label..init_an_int..\r\n}
+ { incr ok; exp_continue }
+ -re {^process[^\r\n]*function[^\r\n]*labels.c:16...label..init_an_int..\r\n}
+ { incr ok; exp_continue }
+ -re {^process[^\r\n]*function[^\r\n]*labels.c:18...label..init_an_int_again..\r\n}
+ { incr ok; exp_continue }
+ -re {^process[^\r\n]*function[^\r\n]*labels.c:21...label..ptr_inited..\r\n}
+ { incr ok; exp_continue }
timeout { fail "$test (timeout)" }
eof { }
}
-if {$ok == 1} { pass "$test -l .label" } { fail "$test -l .label $ok" }
+if {$ok == 4} { pass "$test -l .label" } { fail "$test -l .label $ok" }
# label in an executable