diff options
| -rw-r--r-- | testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | testsuite/systemtap.base/marker.exp | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog index b60527ee..f2ec2544 100644 --- a/testsuite/ChangeLog +++ b/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2008-01-04 David Smith <dsmith@redhat.com> + + * systemtap.base/marker.exp: Improved regexp that finds markers + with arguments. + 2007-12-12 Martin Hunt <hunt@redhat.com> Detect crashing stap and report as a test failure. * lib/systemtap.exp (stap_run_batch): Return -1 if stap diff --git a/testsuite/systemtap.base/marker.exp b/testsuite/systemtap.base/marker.exp index 1b750409..01d1ed54 100644 --- a/testsuite/systemtap.base/marker.exp +++ b/testsuite/systemtap.base/marker.exp @@ -59,7 +59,7 @@ if {! [catch {open $path RDONLY} fl]} { while {[gets $fl s] >= 0} { # This regexp only picks up markers that contain arguments. # This helps ensure that K_MARKER04 passes correctly. - if [regexp {^([^ \t]+)\t[^ \t]+.+$} $s match name] { + if [regexp {^([^ \t]+)\t[^ \t]+.*%.+$} $s match name] { set kernel_markers_found 1 lappend kernel_marker_names $name } |