diff options
| -rw-r--r-- | testsuite/ChangeLog | 3 | ||||
| -rw-r--r-- | testsuite/systemtap.base/marker.exp | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog index 52d88c24..dd2c9766 100644 --- a/testsuite/ChangeLog +++ b/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2007-09-25 David Smith <dsmith@redhat.com> + * systemtap.base/marker.exp: Improved regexp to work correctly on + kernels with no markers. + * systemtap.base/marker.exp: Updated for the 9/18/2007 markers patch. diff --git a/testsuite/systemtap.base/marker.exp b/testsuite/systemtap.base/marker.exp index b9085e32..3ea909fd 100644 --- a/testsuite/systemtap.base/marker.exp +++ b/testsuite/systemtap.base/marker.exp @@ -96,7 +96,8 @@ set km_script {"probe kernel.mark(\"%s\"), module(\"%s\").mark(\"%s\") { }"} # or in any loaded module set fl [open "| egrep __mark_.+\.\[0-9\]+ /proc/kallsyms"] while {[gets $fl s] >= 0} { - if [regexp {__mark_([^.]+).[0-9]+(\t+\[(.+)\])?} $s match name subexp module] { + if [regexp {__mark_([^.]+)\.[0-9]+(\t+\[(.+)\])?} $s match name subexp module] { + puts "$name $subexp $module" if {$module == ""} { set kernel_markers_found 1 lappend kernel_marker_names $name |