diff options
| author | Dave Brolley <brolley@redhat.com> | 2008-09-12 11:26:06 -0400 |
|---|---|---|
| committer | Dave Brolley <brolley@redhat.com> | 2008-09-12 11:26:06 -0400 |
| commit | 87fa559f6de5e781f3ba2fe150d7421fb7d75efa (patch) | |
| tree | 5d4218da9b0f949954a1e0ce320b17d131a369fd /testsuite/systemtap.base | |
| parent | 2c92c3026644f70f2628949a5cc0f94506a46ff5 (diff) | |
| parent | 3438f38f647db43bfc06b12930b7dfc14af7d67d (diff) | |
| download | systemtap-steved-87fa559f6de5e781f3ba2fe150d7421fb7d75efa.tar.gz systemtap-steved-87fa559f6de5e781f3ba2fe150d7421fb7d75efa.tar.xz systemtap-steved-87fa559f6de5e781f3ba2fe150d7421fb7d75efa.zip | |
Merge branch 'master' of ssh://sources.redhat.com/git/systemtap
Conflicts:
ChangeLog
Diffstat (limited to 'testsuite/systemtap.base')
| -rw-r--r-- | testsuite/systemtap.base/uprobes.exp | 5 | ||||
| -rwxr-xr-x | testsuite/systemtap.base/uprobes.stp | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/testsuite/systemtap.base/uprobes.exp b/testsuite/systemtap.base/uprobes.exp index 8fbe6da6..391f5028 100644 --- a/testsuite/systemtap.base/uprobes.exp +++ b/testsuite/systemtap.base/uprobes.exp @@ -8,6 +8,7 @@ set fp [open $path "w"] puts $fp "int main (int argc, char *argv[])" puts $fp "{" puts $fp "if (argc > 1) main (argc - 1, argv);" +puts $fp "return 0;" puts $fp "}" close $fp @@ -30,8 +31,8 @@ expect { -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 } + -re {^process[^\r\n]*jennie[^\r\n]*main[^\r\n]*call argc=0x[1-5][^\r\n]*\r\n} { incr ok; exp_continue } + -re {^process[^\r\n]*jennie[^\r\n]*main[^\r\n]*return return=0x0[^\r\n]*\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 8e7dbe9d..32bc1a70 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) } |