5 files changed, 34 insertions, 3 deletions
diff --git a/testsuite/buildok/uaddr.stp b/testsuite/buildok/uaddr.stp
new file mode 100755
index 00000000..8acfc495
--- /dev/null
+++ b/testsuite/buildok/uaddr.stp
@@ -0,0 +1,8 @@
+#! stap -p4
+#
+# Test the translatability for uaddr()
+#
+probe begin
+{
+   printf("uaddr: 0x%x\n", uaddr())
+}
diff --git a/testsuite/buildok/usymdata.stp b/testsuite/buildok/usymdata.stp
new file mode 100755
index 00000000..48c1f36f
--- /dev/null
+++ b/testsuite/buildok/usymdata.stp
@@ -0,0 +1,8 @@
+#! stap -p4
+#
+# Test the translatability for usymdata()
+#
+probe begin
+{
+   log(usymdata(0))
+}
diff --git a/testsuite/buildok/usymname.stp b/testsuite/buildok/usymname.stp
new file mode 100755
index 00000000..57e3f9c2
--- /dev/null
+++ b/testsuite/buildok/usymname.stp
@@ -0,0 +1,8 @@
+#! stap -p4
+#
+# Test the translatability for usymname()
+#
+probe begin
+{
+   log(usymname(0))
+}
diff --git a/testsuite/systemtap.context/usymbols.exp b/testsuite/systemtap.context/usymbols.exp
index 8af20126..39b3b442 100644
--- a/testsuite/systemtap.context/usymbols.exp
+++ b/testsuite/systemtap.context/usymbols.exp
@@ -35,7 +35,7 @@ set testscript {
     probe syscall.rt_sigaction {
       if (pid() == target() && execname() == "%s") {
 	  handler = $act->sa_handler;
-	  printf("handler: %%s\n", symname(handler));
+	  printf("handler: %%s\n", usymname(handler));
       }
     }
     /* track through uprobes, so as to make sure we have the symbols */
@@ -56,8 +56,7 @@ if {[string equal "link" [file type $libpath]]} {
 }
 send_log "libpath: $libpath\n"
 
-# XXX Cheat, explicitly add STP_NEED_VMA_TRACKER
-set cmd [concat stap -DSTP_NEED_VMA_TRACKER -d $libpath -d $testexe -c $testexe -e {$script}]
+set cmd [concat stap -d $libpath -d $testexe -c $testexe -e {$script}]
 send_log "cmd: $cmd\n"
 catch {eval exec $cmd} res
 send_log "cmd output: $res\n"
diff --git a/testsuite/systemtap.examples/network/nettop.stp b/testsuite/systemtap.examples/network/nettop.stp
index 15b4d62a..b84e4882 100755
--- a/testsuite/systemtap.examples/network/nettop.stp
+++ b/testsuite/systemtap.examples/network/nettop.stp
@@ -1,6 +1,7 @@
 #! /usr/bin/env stap
 
 global ifxmit, ifrecv
+global ifmerged
 
 probe netdev.transmit
 {
@@ -19,6 +20,12 @@ function print_activity()
          "XMIT_KB", "RECV_KB", "COMMAND")
 
   foreach ([pid, dev, exec, uid] in ifrecv-) {
+	  ifmerged[pid, dev, exec, uid] = 1;
+  }
+  foreach ([pid, dev, exec, uid] in ifxmit-) {
+	  ifmerged[pid, dev, exec, uid] = 1;
+  }
+  foreach ([pid, dev, exec, uid] in ifmerged-) {
     n_xmit = @count(ifxmit[pid, dev, exec, uid])
     n_recv = @count(ifrecv[pid, dev, exec, uid])
     printf("%5d %5d %-7s %7d %7d %7d %7d %-15s\n",
@@ -32,6 +39,7 @@ function print_activity()
 
   delete ifxmit
   delete ifrecv
+  delete ifmerged
 }
 
 probe timer.ms(5000), end, error