diff options
| -rw-r--r-- | testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | testsuite/systemtap.base/uprobes.exp | 8 | ||||
| -rwxr-xr-x | testsuite/systemtap.base/uprobes.stp | 4 |
3 files changed, 13 insertions, 4 deletions
diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog index 045772a3..14d20744 100644 --- a/testsuite/ChangeLog +++ b/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2008-09-09 Frank Ch. Eigler <fche@elastic.org> + + * systemtap.base/uprobes.*: Tweak regexps for read-only src tree + tolerance. + 2008-09-06 Frank Ch. Eigler <fche@elastic.org> * systemtap.base/cmd_parse.exp: Adapt to sh-c-less "stap -c" diff --git a/testsuite/systemtap.base/uprobes.exp b/testsuite/systemtap.base/uprobes.exp index a0ae3e76..8fbe6da6 100644 --- a/testsuite/systemtap.base/uprobes.exp +++ b/testsuite/systemtap.base/uprobes.exp @@ -26,8 +26,12 @@ spawn sudo stap -v $srcdir/$subdir/uprobes.stp -c "./jennie 1 2 3 4" set ok 0 expect { -re {^Pass[^\r\n]*\r\n} { exp_continue } - -re {^process[^\r\n]*jennie[^\r\n]*main[^\r\n]*call[^\r\n]*\r\n} { incr ok; exp_continue } - -re {^process[^\r\n]*jennie[^\r\n]*main[^\r\n]*return[^\r\n]*\r\n} { incr ok; exp_continue } + -re {^Warning[^\r\n]*\r\n} { exp_continue } + -re {^Disabling[^\r\n]*\r\n} { exp_continue } + -re {^Uprobes[^\r\n]*\r\n} { exp_continue } + -re {^Cache[^\r\n]*\r\n} { exp_continue } + -re {^process[^\r\n]*jennie[^\r\n]*main[^\r\n]*call\r\n} { incr ok; exp_continue } + -re {^process[^\r\n]*jennie[^\r\n]*main[^\r\n]*return\r\n} { incr ok; exp_continue } -timeout 30 timeout { } eof { } diff --git a/testsuite/systemtap.base/uprobes.stp b/testsuite/systemtap.base/uprobes.stp index d7efb586..8e7dbe9d 100755 --- a/testsuite/systemtap.base/uprobes.stp +++ b/testsuite/systemtap.base/uprobes.stp @@ -1,3 +1,3 @@ #! stap -p4 -probe process("./jennie").function("main").call { log(pp()." "/*.$$parms*/) } -probe process("./jennie").function("main").return { log(pp()." "/*.$$return*/) } +probe process("./jennie").function("main").call { log(pp()/*." ".$$parms*/) } +probe process("./jennie").function("main").return { log(pp()/*." ".$$return*/) } |