summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhunt <hunt>2006-11-30 16:31:23 +0000
committerhunt <hunt>2006-11-30 16:31:23 +0000
commit396a86ddf9550e4f2e850173dacd42346a521079 (patch)
tree16804c6ed9d74d2bd27cd89abd94c4348c798bca
parent83d7fcdcf15d300c7d6079b0c90076d8c365078c (diff)
downloadsystemtap-steved-396a86ddf9550e4f2e850173dacd42346a521079.tar.gz
systemtap-steved-396a86ddf9550e4f2e850173dacd42346a521079.tar.xz
systemtap-steved-396a86ddf9550e4f2e850173dacd42346a521079.zip
2006-11-30 Martin Hunt <hunt@redhat.com>
* systemtap.samples/pfaults.exp: Fix regular expression to handle buffering issues that broke on MP systems.
-rw-r--r--testsuite/ChangeLog5
-rw-r--r--testsuite/systemtap.samples/pfaults.exp4
2 files changed, 7 insertions, 2 deletions
diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog
index 22f4f889..131bd06c 100644
--- a/testsuite/ChangeLog
+++ b/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-30 Martin Hunt <hunt@redhat.com>
+
+ * systemtap.samples/pfaults.exp: Fix regular expression
+ to handle buffering issues that broke on MP systems.
+
2006-11-29 Li Guanglei <guanglei@cn.ibm.com>
From Gui Jian <guijian@cn.ibm.com>
diff --git a/testsuite/systemtap.samples/pfaults.exp b/testsuite/systemtap.samples/pfaults.exp
index b230cc6a..30599df5 100644
--- a/testsuite/systemtap.samples/pfaults.exp
+++ b/testsuite/systemtap.samples/pfaults.exp
@@ -6,9 +6,9 @@ set pid $spawn_id
set ok 0
expect {
-timeout 30
- -re "Page fault tracking, start time" { incr ok; exp_continue }
+ -re {Page fault tracking, start time[^\r\n]+\r\n} { incr ok; exp_continue }
-timeout 30
- -re "Page fault tracking, end time" { incr ok; exp_continue }
+ -re {Page fault tracking, end time[^\r\n]+\r\n} { incr ok; exp_continue }
timeout { fail "$test (timeout)" }
eof { }
}