3 files changed, 9 insertions, 8 deletions
diff --git a/testsuite/systemtap.base/optim_arridx.exp b/testsuite/systemtap.base/optim_arridx.exp
index 89282d1b..bef4d2b4 100644
--- a/testsuite/systemtap.base/optim_arridx.exp
+++ b/testsuite/systemtap.base/optim_arridx.exp
@@ -9,15 +9,15 @@ elide_idx1:long
 elide_global_a:long
 elide_global_b:long
 # functions
-fna:long (a:long)
-return a
-fnb:long (a:long, b:long)
-return (a) + (b)
 exit:unknown ()
 %{
     atomic_set (&session_state, STAP_SESSION_STOPPING);
     _stp_exit ();
 %}
+fna:long (a:long)
+return a
+fnb:long (a:long, b:long)
+return (a) + (b)
 # probes
 begin /* <- begin */
   # locals
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..b609f3a1 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 { printf("%s %s\n",pp(),$$parms) }
+probe process("./jennie").function("main").return { printf("%s %s\n",pp(),$$return) }