summaryrefslogtreecommitdiffstats
path: root/testsuite/systemtap.base
diff options
context:
space:
mode:
Diffstat (limited to 'testsuite/systemtap.base')
-rw-r--r--testsuite/systemtap.base/uprobes.exp5
-rwxr-xr-xtestsuite/systemtap.base/uprobes.stp4
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) }