From 059cd9efbd82e1017406a7a290a2fb9f6bfb64f7 Mon Sep 17 00:00:00 2001
From: "Frank Ch. Eigler" <fche@elastic.org>
Date: Thu, 30 Apr 2009 17:07:43 -0400
Subject: [PATCH] syscalls testsuite: use different escape sequence

The syscall testsuite uses embedded "// TEXT" markers in the .c files
to designate expected output, kind of like the "dg-" bunch in the gcc
test suite.  Unfortunately, "//" is not a unique prefix to systemtap
tests, and in particular it can occur in the system headers that will
be picked up with the "gcc -E -C ..." invocation in test.tcl.

So let's switch to "//staptest//".  test.tcl is also modified to
escape a few more mischevious regexp metacharacters that might sneak
past.
---
 testsuite/systemtap.syscall/access.c    | 24 +++++++-------
 testsuite/systemtap.syscall/acct.c      |  2 +-
 testsuite/systemtap.syscall/alarm.c     | 20 +++++------
 testsuite/systemtap.syscall/chmod.c     | 44 ++++++++++++-------------
 testsuite/systemtap.syscall/clock.c     | 38 ++++++++++-----------
 testsuite/systemtap.syscall/dir.c       | 24 +++++++-------
 testsuite/systemtap.syscall/forkwait.c  |  4 +--
 testsuite/systemtap.syscall/futimes.c   | 14 ++++----
 testsuite/systemtap.syscall/itimer.c    | 14 ++++----
 testsuite/systemtap.syscall/link.c      | 20 +++++------
 testsuite/systemtap.syscall/mmap.c      | 22 ++++++-------
 testsuite/systemtap.syscall/mount.c     | 10 +++---
 testsuite/systemtap.syscall/net1.c      | 12 +++----
 testsuite/systemtap.syscall/openclose.c | 32 +++++++++---------
 testsuite/systemtap.syscall/poll.c      | 10 +++---
 testsuite/systemtap.syscall/readwrite.c | 34 +++++++++----------
 testsuite/systemtap.syscall/rt_signal.c | 12 +++----
 testsuite/systemtap.syscall/select.c    |  8 ++---
 testsuite/systemtap.syscall/sendfile.c  |  2 +-
 testsuite/systemtap.syscall/signal.c    | 14 ++++----
 testsuite/systemtap.syscall/stat.c      | 18 +++++-----
 testsuite/systemtap.syscall/statfs.c    |  6 ++--
 testsuite/systemtap.syscall/swap.c      | 12 +++----
 testsuite/systemtap.syscall/sync.c      |  6 ++--
 testsuite/systemtap.syscall/test.tcl    | 13 +++++---
 testsuite/systemtap.syscall/timer.c     | 10 +++---
 testsuite/systemtap.syscall/trunc.c     |  4 +--
 testsuite/systemtap.syscall/uid.c       | 32 +++++++++---------
 testsuite/systemtap.syscall/uid16.c     | 32 +++++++++---------
 testsuite/systemtap.syscall/umask.c     | 12 +++----
 testsuite/systemtap.syscall/unlink.c    | 12 +++----
 31 files changed, 261 insertions(+), 256 deletions(-)
 mode change 100755 => 100644 testsuite/systemtap.syscall/alarm.c
 mode change 100755 => 100644 testsuite/systemtap.syscall/swap.c

diff --git a/testsuite/systemtap.syscall/access.c b/testsuite/systemtap.syscall/access.c
index 682424d42..450660156 100644
--- a/testsuite/systemtap.syscall/access.c
+++ b/testsuite/systemtap.syscall/access.c
@@ -13,28 +13,28 @@ int main()
   fd1 = creat("foobar1",S_IREAD|S_IWRITE);
 
   access("foobar1", F_OK);
-  // access ("foobar1", F_OK)
-  //   faccessat (AT_FDCWD, "foobar1", F_OK) = 0
+  //staptest// access ("foobar1", F_OK)
+  //staptest//   faccessat (AT_FDCWD, "foobar1", F_OK) = 0
 
   access("foobar1", R_OK);
-  // access ("foobar1", R_OK)
-  //  faccessat (AT_FDCWD, "foobar1", R_OK) = 0
+  //staptest// access ("foobar1", R_OK)
+  //staptest//  faccessat (AT_FDCWD, "foobar1", R_OK) = 0
 
   access("foobar1", W_OK);
-  // access ("foobar1", W_OK)
-  //   faccessat (AT_FDCWD, "foobar1", W_OK) = 0
+  //staptest// access ("foobar1", W_OK)
+  //staptest//   faccessat (AT_FDCWD, "foobar1", W_OK) = 0
 
   access("foobar1", X_OK);
-  // access ("foobar1", X_OK)
-  //   faccessat (AT_FDCWD, "foobar1", X_OK) = -NNNN (EACCES)
+  //staptest// access ("foobar1", X_OK)
+  //staptest//   faccessat (AT_FDCWD, "foobar1", X_OK) = -NNNN (EACCES)
 
   access("foobar1", R_OK|W_OK);
-  // access ("foobar1", W_OK |R_OK)
-  //   faccessat (AT_FDCWD, "foobar1", W_OK |R_OK) = 0
+  //staptest// access ("foobar1", W_OK |R_OK)
+  //staptest//   faccessat (AT_FDCWD, "foobar1", W_OK |R_OK) = 0
 
   access("foobar1", R_OK|W_OK|X_OK);
-  // access ("foobar1", X_OK |W_OK |R_OK)
-  //   faccessat (AT_FDCWD, "foobar1", X_OK |W_OK |R_OK) = -NNNN (EACCES)
+  //staptest// access ("foobar1", X_OK |W_OK |R_OK)
+  //staptest//   faccessat (AT_FDCWD, "foobar1", X_OK |W_OK |R_OK) = -NNNN (EACCES)
 
   return 0;
 }
diff --git a/testsuite/systemtap.syscall/acct.c b/testsuite/systemtap.syscall/acct.c
index 927e40c99..47f879612 100644
--- a/testsuite/systemtap.syscall/acct.c
+++ b/testsuite/systemtap.syscall/acct.c
@@ -4,7 +4,7 @@
 int main()
 {
   acct("foobar");
-  // acct ("foobar") = -NNNN
+  //staptest// acct ("foobar") = -NNNN
 
   return 0;
 }
diff --git a/testsuite/systemtap.syscall/alarm.c b/testsuite/systemtap.syscall/alarm.c
old mode 100755
new mode 100644
index 7cb17164b..6f1bedce2
--- a/testsuite/systemtap.syscall/alarm.c
+++ b/testsuite/systemtap.syscall/alarm.c
@@ -20,36 +20,36 @@ int main()
 
   alarm(1);
 #ifdef __ia64__
-  // setitimer (ITIMER_REAL, \[0.000000,1.000000\], XXXX) = 0
+  //staptest// setitimer (ITIMER_REAL, \[0.000000,1.000000\], XXXX) = 0
 #else
-  // alarm (1) = 0
+  //staptest// alarm (1) = 0
 #endif
 
   pause();
 #ifdef __ia64__
-  // rt_sigsuspend () =
+  //staptest// rt_sigsuspend () =
 #else
-  // pause () =
+  //staptest// pause () =
 #endif
 
   alarm(0);
 #ifdef __ia64__
-  // setitimer (ITIMER_REAL, \[0.000000,0.000000\], XXXX) = 0
+  //staptest// setitimer (ITIMER_REAL, \[0.000000,0.000000\], XXXX) = 0
 #else
-  // alarm (0) = 0
+  //staptest// alarm (0) = 0
 #endif
 
   sleep(1);
-  // nanosleep (\[1.000000000\], XXXX) = 0
+  //staptest// nanosleep (\[1.000000000\], XXXX) = 0
 
   usleep(1234);
-  // nanosleep (\[0.001234000\], 0x[0]+) = 0
+  //staptest// nanosleep (\[0.001234000\], 0x[0]+) = 0
 
   nanosleep(&t, &rem); 
-  // nanosleep (\[0.000000789\], XXXX) = 0
+  //staptest// nanosleep (\[0.000000789\], XXXX) = 0
 
   nanosleep(&t, NULL); 
-  // nanosleep (\[0.000000789\], 0x[0]+) = 0
+  //staptest// nanosleep (\[0.000000789\], 0x[0]+) = 0
 
   return 0;
 }
diff --git a/testsuite/systemtap.syscall/chmod.c b/testsuite/systemtap.syscall/chmod.c
index 9b0c58e13..724b86c42 100644
--- a/testsuite/systemtap.syscall/chmod.c
+++ b/testsuite/systemtap.syscall/chmod.c
@@ -11,70 +11,70 @@ int main()
   int fd;
 
   fd = open("foobar",O_WRONLY|O_CREAT, 0666);
-  // open ("foobar", O_WRONLY|O_CREAT, 0666) = NNNN
+  //staptest// open ("foobar", O_WRONLY|O_CREAT, 0666) = NNNN
 
   chmod("foobar", 0644);
-  // chmod ("foobar", 0644)
-  //   fchmodat (AT_FDCWD, "foobar", 0644) = 0
+  //staptest// chmod ("foobar", 0644)
+  //staptest//   fchmodat (AT_FDCWD, "foobar", 0644) = 0
 
   fchmod(fd, 0444);
-  // fchmod (NNNN, 0444) = 0
+  //staptest// fchmod (NNNN, 0444) = 0
 
   chown("foobar", 5000, -1);
 #ifdef __i386__
-  // chown ("foobar", 5000, -1) =
+  //staptest// chown ("foobar", 5000, -1) =
 #else
-  // chown ("foobar", 5000, NNNN) =
+  //staptest// chown ("foobar", 5000, NNNN) =
 #endif
 
   chown("foobar", -1, 5001);
 #ifdef __i386__
-  // chown ("foobar", -1, 5001) =
+  //staptest// chown ("foobar", -1, 5001) =
 #else
-  // chown ("foobar", NNNN, 5001) =
+  //staptest// chown ("foobar", NNNN, 5001) =
 #endif
 
   fchown(fd, 5002, -1);
 #ifdef __i386__
-  // fchown (NNNN, 5002, -1) =
+  //staptest// fchown (NNNN, 5002, -1) =
 #else
-  // fchown (NNNN, 5002, NNNN) =
+  //staptest// fchown (NNNN, 5002, NNNN) =
 #endif
 
   fchown(fd, -1, 5003);
 #ifdef __i386__
-  // fchown (NNNN, -1, 5003) =
+  //staptest// fchown (NNNN, -1, 5003) =
 #else
-  // fchown (NNNN, NNNN, 5003) =
+  //staptest// fchown (NNNN, NNNN, 5003) =
 #endif
 
   lchown("foobar", 5004, -1);
 #ifdef __i386__
-  // lchown ("foobar", 5004, -1) =
+  //staptest// lchown ("foobar", 5004, -1) =
 #else
-  // lchown ("foobar", 5004, NNNN) =
+  //staptest// lchown ("foobar", 5004, NNNN) =
 #endif
 
   lchown("foobar", -1, 5005);
 #ifdef __i386__
-  // lchown ("foobar", -1, 5005) =
+  //staptest// lchown ("foobar", -1, 5005) =
 #else
-  // lchown ("foobar", NNNN, 5005) =
+  //staptest// lchown ("foobar", NNNN, 5005) =
 #endif
 
 #ifdef __i386__
   syscall(SYS_chown, "foobar", 5000, -1);
-  // chown16 ("foobar", 5000, -1) =
+  //staptest// chown16 ("foobar", 5000, -1) =
   syscall(SYS_chown, "foobar", -1, 5001);
-  // chown16 ("foobar", -1, 5001) =
+  //staptest// chown16 ("foobar", -1, 5001) =
   syscall(SYS_fchown, fd, 5002, -1);
-  // fchown16 (NNNN, 5002, -1) =
+  //staptest// fchown16 (NNNN, 5002, -1) =
   syscall(SYS_fchown, fd, -1, 5003);
-  // fchown16 (NNNN, -1, 5003) =
+  //staptest// fchown16 (NNNN, -1, 5003) =
   syscall(SYS_lchown, "foobar", 5004, -1);
-  // lchown16 ("foobar", 5004, -1) =
+  //staptest// lchown16 ("foobar", 5004, -1) =
   syscall(SYS_lchown, "foobar", -1, 5005);
-  // lchown16 ("foobar", -1, 5005) =
+  //staptest// lchown16 ("foobar", -1, 5005) =
 #endif
 
   close(fd);
diff --git a/testsuite/systemtap.syscall/clock.c b/testsuite/systemtap.syscall/clock.c
index bc84871da..995d59df6 100644
--- a/testsuite/systemtap.syscall/clock.c
+++ b/testsuite/systemtap.syscall/clock.c
@@ -14,64 +14,64 @@ int main()
 
 #ifdef SYS_time
   syscall(SYS_time, &tt);
-  // time (XXXX) = NNNN
+  //staptest// time (XXXX) = NNNN
   
   syscall(SYS_time, NULL);
-  // time (0x[0]+) = NNNN
+  //staptest// time (0x[0]+) = NNNN
 #endif
 
   t = syscall(SYS_gettimeofday, &tv, NULL);
-  // gettimeofday (XXXX, 0x[0]+) = 0
+  //staptest// gettimeofday (XXXX, 0x[0]+) = 0
 
   settimeofday(&tv, NULL);
-  // settimeofday (\[NNNN.NNNN\], NULL) =
+  //staptest// settimeofday (\[NNNN.NNNN\], NULL) =
 
   syscall(SYS_clock_gettime, CLOCK_REALTIME, &ts);
-  // clock_gettime (CLOCK_REALTIME, XXXX) = 0
+  //staptest// clock_gettime (CLOCK_REALTIME, XXXX) = 0
 
   syscall(SYS_clock_settime, CLOCK_REALTIME, &ts);
-  // clock_settime (CLOCK_REALTIME, \[NNNN.NNNN\]) =
+  //staptest// clock_settime (CLOCK_REALTIME, \[NNNN.NNNN\]) =
 
   syscall(SYS_clock_getres, CLOCK_REALTIME, &ts);
-  // clock_getres (CLOCK_REALTIME, XXXX) = 0
+  //staptest// clock_getres (CLOCK_REALTIME, XXXX) = 0
 
   syscall(SYS_clock_gettime, CLOCK_MONOTONIC, &ts);
-  // clock_gettime (CLOCK_MONOTONIC, XXXX) = 0
+  //staptest// clock_gettime (CLOCK_MONOTONIC, XXXX) = 0
 
   syscall(SYS_clock_settime, CLOCK_MONOTONIC, &ts);
-  // clock_settime (CLOCK_MONOTONIC, \[NNNN.NNNN\]) =
+  //staptest// clock_settime (CLOCK_MONOTONIC, \[NNNN.NNNN\]) =
 
   syscall(SYS_clock_getres, CLOCK_MONOTONIC, &ts);
-  // clock_getres (CLOCK_MONOTONIC, XXXX) = 0
+  //staptest// clock_getres (CLOCK_MONOTONIC, XXXX) = 0
 
   syscall(SYS_clock_gettime, CLOCK_PROCESS_CPUTIME_ID, &ts);
-  // clock_gettime (CLOCK_PROCESS_CPUTIME_ID, XXXX) =
+  //staptest// clock_gettime (CLOCK_PROCESS_CPUTIME_ID, XXXX) =
 
   syscall(SYS_clock_settime, CLOCK_PROCESS_CPUTIME_ID, &ts);
-  // clock_settime (CLOCK_PROCESS_CPUTIME_ID, \[NNNN.NNNN\]) =
+  //staptest// clock_settime (CLOCK_PROCESS_CPUTIME_ID, \[NNNN.NNNN\]) =
 
   syscall(SYS_clock_getres, CLOCK_PROCESS_CPUTIME_ID, &ts);
-  // clock_getres (CLOCK_PROCESS_CPUTIME_ID, XXXX) =
+  //staptest// clock_getres (CLOCK_PROCESS_CPUTIME_ID, XXXX) =
 
   syscall(SYS_clock_gettime, CLOCK_THREAD_CPUTIME_ID, &ts);
-  // clock_gettime (CLOCK_THREAD_CPUTIME_ID, XXXX) =
+  //staptest// clock_gettime (CLOCK_THREAD_CPUTIME_ID, XXXX) =
 
   syscall(SYS_clock_settime, CLOCK_THREAD_CPUTIME_ID, &ts);
-  // clock_settime (CLOCK_THREAD_CPUTIME_ID, \[NNNN.NNNN\]) =
+  //staptest// clock_settime (CLOCK_THREAD_CPUTIME_ID, \[NNNN.NNNN\]) =
 
   syscall(SYS_clock_getres, CLOCK_THREAD_CPUTIME_ID, &ts);
-  // clock_getres (CLOCK_THREAD_CPUTIME_ID, XXXX) =
+  //staptest// clock_getres (CLOCK_THREAD_CPUTIME_ID, XXXX) =
 
   syscall(SYS_clock_gettime, CLOCK_REALTIME, &ts);
-  // clock_gettime (CLOCK_REALTIME, XXXX) = 0
+  //staptest// clock_gettime (CLOCK_REALTIME, XXXX) = 0
 
   ts.tv_sec++;
   syscall(SYS_clock_nanosleep, CLOCK_REALTIME, TIMER_ABSTIME, &ts);
-  // clock_nanosleep (CLOCK_REALTIME, TIMER_ABSTIME, \[NNNN.NNNN\], XXXX) = 0
+  //staptest// clock_nanosleep (CLOCK_REALTIME, TIMER_ABSTIME, \[NNNN.NNNN\], XXXX) = 0
 
   ts.tv_sec = 0;   ts.tv_nsec = 10000;  
   syscall(SYS_clock_nanosleep, CLOCK_REALTIME, 0x0, &ts);
-  // clock_nanosleep (CLOCK_REALTIME, 0x0, \[NNNN.NNNN\], XXXX) = 0
+  //staptest// clock_nanosleep (CLOCK_REALTIME, 0x0, \[NNNN.NNNN\], XXXX) = 0
   
   return 0;
 }
diff --git a/testsuite/systemtap.syscall/dir.c b/testsuite/systemtap.syscall/dir.c
index 5de4ce353..3eda81750 100644
--- a/testsuite/systemtap.syscall/dir.c
+++ b/testsuite/systemtap.syscall/dir.c
@@ -11,43 +11,43 @@ int main()
   int fd;
 
   mkdir("foobar", 0765);
-  // mkdir ("foobar", 0765) =
+  //staptest// mkdir ("foobar", 0765) =
 
   chdir("foobar");
-  // chdir ("foobar") = 0
+  //staptest// chdir ("foobar") = 0
 
   chdir("..");
-  // chdir ("..") = 0
+  //staptest// chdir ("..") = 0
 
   fd = open("foobar", O_RDONLY);
-  // open ("foobar", O_RDONLY) = NNNN
+  //staptest// open ("foobar", O_RDONLY) = NNNN
 
   fchdir(fd);
-  // fchdir (NNNN) = 0
+  //staptest// fchdir (NNNN) = 0
 
   chdir("..");
-  // chdir ("..") = 0
+  //staptest// chdir ("..") = 0
 
   close(fd);
-  // close (NNNN) = 0
+  //staptest// close (NNNN) = 0
 
   rmdir("foobar");
-  // rmdir ("foobar") = 0
+  //staptest// rmdir ("foobar") = 0
 
   fd = open(".", O_RDONLY);
-  // open (".", O_RDONLY) = NNNN
+  //staptest// open (".", O_RDONLY) = NNNN
 
 #ifdef SYS_mkdirat
   mkdirat(fd, "xyzzy", 0765);
-  // mkdirat (NNNN, "xyzzy", 0765) = 0
+  //staptest// mkdirat (NNNN, "xyzzy", 0765) = 0
 
 #endif
 
   close(fd);
-  // close (NNNN) = 0
+  //staptest// close (NNNN) = 0
 
   rmdir("xyzzy");
-  // rmdir ("xyzzy") =
+  //staptest// rmdir ("xyzzy") =
 
   return 0;
 }
diff --git a/testsuite/systemtap.syscall/forkwait.c b/testsuite/systemtap.syscall/forkwait.c
index bf7516f60..b7df49235 100644
--- a/testsuite/systemtap.syscall/forkwait.c
+++ b/testsuite/systemtap.syscall/forkwait.c
@@ -12,14 +12,14 @@ int main ()
 	int status;
 	
 	child = fork();
-	// fork () = NNNN
+	//staptest// fork () = NNNN
 	if (!child) {
 		int i = 0xfffff;
 		while (i > 0) i--;
 		exit(0);
 	}
 	wait4(child, &status, WNOHANG, NULL);
-	// wait4 (NNNN, XXXX, WNOHANG, XXXX) = NNNN
+	//staptest// wait4 (NNNN, XXXX, WNOHANG, XXXX) = NNNN
 
 	return 0;
 }
diff --git a/testsuite/systemtap.syscall/futimes.c b/testsuite/systemtap.syscall/futimes.c
index eca1efc74..4b8125132 100644
--- a/testsuite/systemtap.syscall/futimes.c
+++ b/testsuite/systemtap.syscall/futimes.c
@@ -31,20 +31,20 @@ int main()
  times.actime = 1000000000;
  times.modtime = 2000000000;
  syscall(__NR_utime, "foobar", &times );
- // utime ("foobar", \[Sun Sep  9 01:46:40 2001, Wed May 18 03:33:20 2033])
+ //staptest// utime ("foobar", \[Sun Sep  9 01:46:40 2001, Wed May 18 03:33:20 2033])
 #endif /* __NR_utimes */
   
 #ifdef __NR_utimes
   syscall(__NR_utimes, "foobar", tv);
-  // utimes ("foobar", \[1000000000.001234\]\[2000000000.005678\])
+  //staptest// utimes ("foobar", \[1000000000.001234\]\[2000000000.005678\])
 #endif /* __NR_utimes */
 
 #ifdef __NR_futimesat
   syscall(__NR_futimesat, 7, "foobar", tv);
-  // futimesat (7, "foobar", \[1000000000.001234\]\[2000000000.005678\])
+  //staptest// futimesat (7, "foobar", \[1000000000.001234\]\[2000000000.005678\])
 
   syscall(__NR_futimesat, AT_FDCWD, "foobar", tv);
-  // futimesat (AT_FDCWD, "foobar", \[1000000000.001234\]\[2000000000.005678\])
+  //staptest// futimesat (AT_FDCWD, "foobar", \[1000000000.001234\]\[2000000000.005678\])
 #endif /* __NR_futimesat */
 
 #ifdef __NR_utimensat
@@ -53,17 +53,17 @@ int main()
   ts[1].tv_sec = 2000000000;
   ts[1].tv_nsec = 56780000;  
   syscall(__NR_utimensat, AT_FDCWD, "foobar", ts, 0);
-  // utimensat (AT_FDCWD, "foobar", \[1000000000.123456789\]\[2000000000.056780000\], 0x0)
+  //staptest// utimensat (AT_FDCWD, "foobar", \[1000000000.123456789\]\[2000000000.056780000\], 0x0)
 
   ts[0].tv_sec = 0;
   ts[0].tv_nsec = UTIME_NOW;
   ts[1].tv_sec = 0;
   ts[1].tv_nsec = UTIME_OMIT;
   syscall(__NR_utimensat, AT_FDCWD, "foobar", ts, AT_SYMLINK_NOFOLLOW);
-  // utimensat (AT_FDCWD, "foobar", \[UTIME_NOW\]\[UTIME_OMIT\], AT_SYMLINK_NOFOLLOW)
+  //staptest// utimensat (AT_FDCWD, "foobar", \[UTIME_NOW\]\[UTIME_OMIT\], AT_SYMLINK_NOFOLLOW)
 
   syscall(__NR_utimensat, 22, "foobar", ts, 0x42);
-  // utimensat (22, "foobar", \[UTIME_NOW\]\[UTIME_OMIT\], 0x42)
+  //staptest// utimensat (22, "foobar", \[UTIME_NOW\]\[UTIME_OMIT\], 0x42)
 
 #endif 
 
diff --git a/testsuite/systemtap.syscall/itimer.c b/testsuite/systemtap.syscall/itimer.c
index 5cebc902b..ec2c8f5f5 100644
--- a/testsuite/systemtap.syscall/itimer.c
+++ b/testsuite/systemtap.syscall/itimer.c
@@ -28,27 +28,27 @@ int main()
   itv.it_value.tv_sec = 1;
   itv.it_value.tv_usec = 0;
   setitimer(ITIMER_REAL, &itv, &old_itv);
-  // setitimer (ITIMER_REAL, \[0.500000,1.000000\], XXXX) = 0
+  //staptest// setitimer (ITIMER_REAL, \[0.500000,1.000000\], XXXX) = 0
 
   itv.it_value.tv_sec = 0;
   itv.it_value.tv_usec = 0;
   setitimer(ITIMER_REAL, &itv, NULL);
-  // setitimer (ITIMER_REAL, \[0.500000,0.000000\], 0x[0]+) = 0
+  //staptest// setitimer (ITIMER_REAL, \[0.500000,0.000000\], 0x[0]+) = 0
 
   setitimer(ITIMER_VIRTUAL, &itv, NULL);
-  // setitimer (ITIMER_VIRTUAL, \[0.500000,0.000000\], 0x[0]+) = 0
+  //staptest// setitimer (ITIMER_VIRTUAL, \[0.500000,0.000000\], 0x[0]+) = 0
   
   setitimer(ITIMER_PROF, &itv, NULL);
-  // setitimer (ITIMER_PROF, \[0.500000,0.000000\], 0x[0]+) = 0
+  //staptest// setitimer (ITIMER_PROF, \[0.500000,0.000000\], 0x[0]+) = 0
 
   getitimer(ITIMER_REAL, &itv);
-  // getitimer (ITIMER_REAL, XXXX) = 0
+  //staptest// getitimer (ITIMER_REAL, XXXX) = 0
 
   getitimer(ITIMER_VIRTUAL, &itv);
-  // getitimer (ITIMER_VIRTUAL, XXXX) = 0
+  //staptest// getitimer (ITIMER_VIRTUAL, XXXX) = 0
 
   getitimer(ITIMER_PROF, &itv);
-  // getitimer (ITIMER_PROF, XXXX) = 0
+  //staptest// getitimer (ITIMER_PROF, XXXX) = 0
   return 0;
 }
  
diff --git a/testsuite/systemtap.syscall/link.c b/testsuite/systemtap.syscall/link.c
index 81280bf23..72f422cde 100644
--- a/testsuite/systemtap.syscall/link.c
+++ b/testsuite/systemtap.syscall/link.c
@@ -13,24 +13,24 @@ int main()
   close(fd);
 
   link("foobar", "foobar2");
-  // link ("foobar", "foobar2")
-  //   linkat (AT_FDCWD, "foobar", AT_FDCWD, "foobar2", 0x0) = 0
+  //staptest// link ("foobar", "foobar2")
+  //staptest//   linkat (AT_FDCWD, "foobar", AT_FDCWD, "foobar2", 0x0) = 0
 
   link("foobar", "foobar");
-  // link ("foobar", "foobar")
-  //   linkat (AT_FDCWD, "foobar", AT_FDCWD, "foobar", 0x0) = -NNNN (EEXIST)
+  //staptest// link ("foobar", "foobar")
+  //staptest//   linkat (AT_FDCWD, "foobar", AT_FDCWD, "foobar", 0x0) = -NNNN (EEXIST)
 
   link("nonexist", "foo");
-  // link ("nonexist", "foo")
-  //   linkat (AT_FDCWD, "nonexist", AT_FDCWD, "foo", 0x0) = -NNNN (ENOENT)
+  //staptest// link ("nonexist", "foo")
+  //staptest//   linkat (AT_FDCWD, "nonexist", AT_FDCWD, "foo", 0x0) = -NNNN (ENOENT)
 
   symlink("foobar", "Sfoobar");
-  // symlink ("foobar", "Sfoobar")
-  //   symlinkat ("foobar", AT_FDCWD, "Sfoobar") = 0
+  //staptest// symlink ("foobar", "Sfoobar")
+  //staptest//   symlinkat ("foobar", AT_FDCWD, "Sfoobar") = 0
 
   readlink("Sfoobar", buf, sizeof(buf));
-  // readlink ("Sfoobar", XXXX, 128)
-  //   readlinkat (AT_FDCWD, "Sfoobar", XXXX, 128)
+  //staptest// readlink ("Sfoobar", XXXX, 128)
+  //staptest//   readlinkat (AT_FDCWD, "Sfoobar", XXXX, 128)
 
   return 0;
 }
diff --git a/testsuite/systemtap.syscall/mmap.c b/testsuite/systemtap.syscall/mmap.c
index a3a0dc344..13145fb26 100644
--- a/testsuite/systemtap.syscall/mmap.c
+++ b/testsuite/systemtap.syscall/mmap.c
@@ -13,41 +13,41 @@ int main()
 
 	/* create a file with something in it */
 	fd = open("foobar",O_WRONLY|O_CREAT|O_TRUNC, 0600);
-	// open ("foobar", O_WRONLY|O_CREAT|O_TRUNC, 0600) = NNNN
+	//staptest// open ("foobar", O_WRONLY|O_CREAT|O_TRUNC, 0600) = NNNN
 	lseek(fd, 1024, SEEK_SET);
 	write(fd, "abcdef", 6);
 	close(fd);
-	// close (NNNN) = 0
+	//staptest// close (NNNN) = 0
 
 	fd = open("foobar", O_RDONLY);
-	// open ("foobar", O_RDONLY) = NNNN
+	//staptest// open ("foobar", O_RDONLY) = NNNN
 
 	/* stat for file size */
 	ret = fstat(fd, &fs);
-	// fstat (NNNN, XXXX) = 0
+	//staptest// fstat (NNNN, XXXX) = 0
 
 	r = mmap(NULL, fs.st_size, PROT_READ, MAP_SHARED, fd, 0);
-	// mmap[2]* (XXXX, 1030, PROT_READ, MAP_SHARED, NNNN, XXXX) = XXXX
+	//staptest// mmap[2]* (XXXX, 1030, PROT_READ, MAP_SHARED, NNNN, XXXX) = XXXX
 
 	close(fd);
 
 	mlock(r, fs.st_size);
-	// mlock (XXXX, 1030) = 0
+	//staptest// mlock (XXXX, 1030) = 0
 
 	msync(r, fs.st_size, MS_SYNC);	
-	// msync (XXXX, 1030, MS_SYNC) = 0
+	//staptest// msync (XXXX, 1030, MS_SYNC) = 0
 
 	munlock(r, fs.st_size);
-	// munlock (XXXX, 1030) = 0
+	//staptest// munlock (XXXX, 1030) = 0
 
 	mlockall(MCL_CURRENT);
-	// mlockall (MCL_CURRENT) = 
+	//staptest// mlockall (MCL_CURRENT) = 
 
 	munlockall();
-	// munlockall () = 0
+	//staptest// munlockall () = 0
 
 	munmap(r, fs.st_size);
-	// munmap (XXXX, 1030) = 0
+	//staptest// munmap (XXXX, 1030) = 0
 
 	return 0;
 }
diff --git a/testsuite/systemtap.syscall/mount.c b/testsuite/systemtap.syscall/mount.c
index 57ae030f7..a59582dd3 100644
--- a/testsuite/systemtap.syscall/mount.c
+++ b/testsuite/systemtap.syscall/mount.c
@@ -17,19 +17,19 @@
 int main()
 {
   mount ("mount_source", "mount_target", "ext2", MS_BIND|MS_NOATIME|MS_NODIRATIME|MS_NOSUID, "some arguments");
-  // mount ("mount_source", "mount_target", "ext2", MS_BIND|MS_NOATIME|MS_NODIRATIME|MS_NOSUID, "some arguments") = -NNNN (ENOENT)
+  //staptest// mount ("mount_source", "mount_target", "ext2", MS_BIND|MS_NOATIME|MS_NODIRATIME|MS_NOSUID, "some arguments") = -NNNN (ENOENT)
 
   umount("umount_target");
-  // umount ("umount_target", 0) = -NNNN (ENOENT)
+  //staptest// umount ("umount_target", 0) = -NNNN (ENOENT)
 
   umount2("umount2_target", MNT_FORCE);
-  // umount ("umount2_target", MNT_FORCE) = -NNNN (ENOENT)
+  //staptest// umount ("umount2_target", MNT_FORCE) = -NNNN (ENOENT)
 
   umount2("umount2_target", MNT_DETACH);
-  // umount ("umount2_target", MNT_DETACH) = -NNNN (ENOENT)
+  //staptest// umount ("umount2_target", MNT_DETACH) = -NNNN (ENOENT)
 
   umount2("umount2_target", MNT_EXPIRE);
-  // umount ("umount2_target", MNT_EXPIRE) = -NNNN (ENOENT)
+  //staptest// umount ("umount2_target", MNT_EXPIRE) = -NNNN (ENOENT)
 
   return 0;
 }
diff --git a/testsuite/systemtap.syscall/net1.c b/testsuite/systemtap.syscall/net1.c
index 219a38604..f8079ffd9 100644
--- a/testsuite/systemtap.syscall/net1.c
+++ b/testsuite/systemtap.syscall/net1.c
@@ -13,12 +13,12 @@ int main()
   
 
   listenfd = socket(AF_INET, SOCK_STREAM, 0);
-  // socket (PF_INET, SOCK_STREAM, 0) = NNNN
+  //staptest// socket (PF_INET, SOCK_STREAM, 0) = NNNN
 
   flags = fcntl(listenfd, F_GETFL, 0);
-  // fcntl[64]* (NNNN, F_GETFL, 0x[0]+) = NNNN
+  //staptest// fcntl[64]* (NNNN, F_GETFL, 0x[0]+) = NNNN
   fcntl(listenfd, F_SETFL, flags | O_NONBLOCK);
-  // fcntl[64]* (NNNN, F_SETFL, XXXX) = 0
+  //staptest// fcntl[64]* (NNNN, F_SETFL, XXXX) = 0
 
   bzero(&sa, sizeof(sa));
   sa.sin_family=AF_INET;
@@ -26,13 +26,13 @@ int main()
   sa.sin_port = htons(8765);
 
   bind(listenfd, (struct sockaddr *)&sa, sizeof(sa));
-  // bind (NNNN, {AF_INET, 0.0.0.0, 8765}, 16) = 0
+  //staptest// bind (NNNN, {AF_INET, 0.0.0.0, 8765}, 16) = 0
 
   listen (listenfd, 7);
-  // listen (NNNN, 7) = 0
+  //staptest// listen (NNNN, 7) = 0
 
   cfd = accept(listenfd, (struct sockaddr *)NULL, NULL);
-  // accept (NNNN, 0x[0]+, 0x[0]+) = -NNNN (EAGAIN)
+  //staptest// accept (NNNN, 0x[0]+, 0x[0]+) = -NNNN (EAGAIN)
 
   close(cfd);
   close(listenfd);
diff --git a/testsuite/systemtap.syscall/openclose.c b/testsuite/systemtap.syscall/openclose.c
index a35f1a597..cb003a9e7 100644
--- a/testsuite/systemtap.syscall/openclose.c
+++ b/testsuite/systemtap.syscall/openclose.c
@@ -13,46 +13,46 @@ int main()
   int fd1, fd2;
 
   fd2 = creat("foobar1",S_IREAD|S_IWRITE);
-  // open ("foobar1", O_WRONLY|O_CREAT|O_TRUNC, 0600) = NNNN
+  //staptest// open ("foobar1", O_WRONLY|O_CREAT|O_TRUNC, 0600) = NNNN
 
   fd1 = open("foobar2",O_WRONLY|O_CREAT, S_IRWXU);
-  // open ("foobar2", O_WRONLY|O_CREAT, 0700) = NNNN
+  //staptest// open ("foobar2", O_WRONLY|O_CREAT, 0700) = NNNN
   close(fd1);
-  // close (NNNN) = 0
+  //staptest// close (NNNN) = 0
 
   fd1 = open("foobar2",O_RDONLY);
-  // open ("foobar2", O_RDONLY) = NNNN
+  //staptest// open ("foobar2", O_RDONLY) = NNNN
   close(fd1);
-  // close (NNNN) = 0
+  //staptest// close (NNNN) = 0
 
   fd1 = open("foobar2",O_RDWR);
-  // open ("foobar2", O_RDWR) = NNNN
+  //staptest// open ("foobar2", O_RDWR) = NNNN
   close(fd1);
-  // close (NNNN) = 0
+  //staptest// close (NNNN) = 0
 
   fd1 = open("foobar2",O_APPEND|O_WRONLY);
-  // open ("foobar2", O_WRONLY|O_APPEND) = NNNN
+  //staptest// open ("foobar2", O_WRONLY|O_APPEND) = NNNN
   close(fd1);
-  // close (NNNN) = 0
+  //staptest// close (NNNN) = 0
 
   fd1 = open("foobar2",O_DIRECT|O_RDWR);
-  // open ("foobar2", O_RDWR|O_DIRECT) = NNNN
+  //staptest// open ("foobar2", O_RDWR|O_DIRECT) = NNNN
   close(fd1);
-  // close (NNNN) = 0
+  //staptest// close (NNNN) = 0
 
   fd1 = open("foobar2",O_NOATIME|O_SYNC|O_RDWR);
-  // open ("foobar2", O_RDWR|O_NOATIME|O_SYNC) = NNNN
+  //staptest// open ("foobar2", O_RDWR|O_NOATIME|O_SYNC) = NNNN
   close(fd1);
-  // close (NNNN) = 0
+  //staptest// close (NNNN) = 0
 
   /* Now test some bad opens */
   fd1 = open("/",O_WRONLY);
-  // open ("/", O_WRONLY) = -NNNN (EISDIR)
+  //staptest// open ("/", O_WRONLY) = -NNNN (EISDIR)
   close (fd1);
-  // close (NNNN) = -NNNN (EBADF)
+  //staptest// close (NNNN) = -NNNN (EBADF)
 
   fd1 = open("foobar2",O_WRONLY|O_CREAT|O_EXCL, S_IRWXU);
-  // open ("foobar2", O_WRONLY|O_CREAT|O_EXCL, 0700) = -NNNN (EEXIST)
+  //staptest// open ("foobar2", O_WRONLY|O_CREAT|O_EXCL, 0700) = -NNNN (EEXIST)
 
   return 0;
 }
diff --git a/testsuite/systemtap.syscall/poll.c b/testsuite/systemtap.syscall/poll.c
index 591c1f745..3caa2b14e 100644
--- a/testsuite/systemtap.syscall/poll.c
+++ b/testsuite/systemtap.syscall/poll.c
@@ -17,21 +17,21 @@ int main()
   sigaddset(&sigs,SIGUSR2);
 
   fd = epoll_create(32);
-  // epoll_create (32)
+  //staptest// epoll_create (32)
 
   epoll_ctl(fd, EPOLL_CTL_ADD, 13, &ev);
-  // epoll_ctl (NNNN, EPOLL_CTL_ADD, 13, XXXX)
+  //staptest// epoll_ctl (NNNN, EPOLL_CTL_ADD, 13, XXXX)
 
   epoll_wait(fd, &ev, 17,0);
-  // epoll_wait (NNNN, XXXX, 17, 0)
+  //staptest// epoll_wait (NNNN, XXXX, 17, 0)
   close(fd);
 
   poll(&pfd, 1, 0);
-  // poll (XXXX, 1, 0)
+  //staptest// poll (XXXX, 1, 0)
 
 #ifdef SYS_ppoll
   ppoll(&pfd, 1, &tim, &sigs);
-  //  ppoll (XXXX, 1, \[0.200000000\], XXXX, 8)
+  //staptest//  ppoll (XXXX, 1, \[0.200000000\], XXXX, 8)
 #endif
 
   return 0;
diff --git a/testsuite/systemtap.syscall/readwrite.c b/testsuite/systemtap.syscall/readwrite.c
index aacd68f2f..bd0914cc8 100644
--- a/testsuite/systemtap.syscall/readwrite.c
+++ b/testsuite/systemtap.syscall/readwrite.c
@@ -26,56 +26,56 @@ int main()
   v[2].iov_len = sizeof(STRING3);
 
   fd = open("foobar1",O_WRONLY|O_CREAT, 0666);
-  // open ("foobar1", O_WRONLY|O_CREAT, 0666) = NNNN
+  //staptest// open ("foobar1", O_WRONLY|O_CREAT, 0666) = NNNN
 
   write(fd,"Hello world", 11);
-  // write (NNNN, "Hello world", 11) = 11
+  //staptest// write (NNNN, "Hello world", 11) = 11
 
   write(fd,"Hello world abcdefghijklmnopqrstuvwxyz 01234567890123456789", 59);
-  // write (NNNN, "Hello world abcdefghijklmnopqrstuvwxyz 012345"..., 59) = 59
+  //staptest// write (NNNN, "Hello world abcdefghijklmnopqrstuvwxyz 012345"..., 59) = 59
 
   pwrite(fd,"Hello Again",11,12);
-  // pwrite (NNNN, "Hello Again", 11, 12) = 11
+  //staptest// pwrite (NNNN, "Hello Again", 11, 12) = 11
 
   writev(fd, v, 3);
-  // writev (NNNN, XXXX, 3) = 15
+  //staptest// writev (NNNN, XXXX, 3) = 15
 
   lseek(fd, 0, SEEK_SET);
-  // lseek (NNNN, 0, SEEK_SET) = 0
+  //staptest// lseek (NNNN, 0, SEEK_SET) = 0
 
   lseek(fd, 1, SEEK_CUR);
-  // lseek (NNNN, 1, SEEK_CUR) = 1
+  //staptest// lseek (NNNN, 1, SEEK_CUR) = 1
 
   lseek(fd, -1, SEEK_END);
-  // lseek (NNNN, -1, SEEK_END) = 84
+  //staptest// lseek (NNNN, -1, SEEK_END) = 84
 
 #ifdef SYS__llseek
   syscall(SYS__llseek, fd, 1, 0, &res, SEEK_SET);
-  // llseek (NNNN, 0x1, 0x0, XXXX, SEEK_SET) = 0
+  //staptest// llseek (NNNN, 0x1, 0x0, XXXX, SEEK_SET) = 0
 
   syscall(SYS__llseek, fd, 0, 0, &res, SEEK_SET);
-  // llseek (NNNN, 0x0, 0x0, XXXX, SEEK_SET) = 0
+  //staptest// llseek (NNNN, 0x0, 0x0, XXXX, SEEK_SET) = 0
 
   syscall(SYS__llseek, fd, 0, 12, &res, SEEK_CUR);
-  // llseek (NNNN, 0x0, 0xc, XXXX, SEEK_CUR) = 0
+  //staptest// llseek (NNNN, 0x0, 0xc, XXXX, SEEK_CUR) = 0
 
   syscall(SYS__llseek, fd, 8, 1, &res, SEEK_END);
-  // llseek (NNNN, 0x8, 0x1, XXXX, SEEK_END) = 0
+  //staptest// llseek (NNNN, 0x8, 0x1, XXXX, SEEK_END) = 0
 #endif
 
   close (fd);
 
   fd = open("foobar1",O_RDONLY);
-  // open ("foobar1", O_RDONLY) = NNNN
+  //staptest// open ("foobar1", O_RDONLY) = NNNN
 
   read(fd, buf, 11);
-  // read (NNNN, XXXX, 11) = 11
+  //staptest// read (NNNN, XXXX, 11) = 11
 
   read(fd, buf, 50);
-  // read (NNNN, XXXX, 50) = 50
+  //staptest// read (NNNN, XXXX, 50) = 50
 
   pread(fd, buf, 11, 10);
-  // pread (NNNN, XXXX, 11, 10) = 11
+  //staptest// pread (NNNN, XXXX, 11, 10) = 11
 
   x[0].iov_base = buf1;
   x[0].iov_len = sizeof(STRING1);
@@ -84,7 +84,7 @@ int main()
   x[2].iov_base = buf3;
   x[2].iov_len = sizeof(STRING3);
   readv(fd, x, 3);
-  // readv (NNNN, XXXX, 3) = 15
+  //staptest// readv (NNNN, XXXX, 3) = 15
 
   close (fd);
 
diff --git a/testsuite/systemtap.syscall/rt_signal.c b/testsuite/systemtap.syscall/rt_signal.c
index f25633b70..537b77067 100644
--- a/testsuite/systemtap.syscall/rt_signal.c
+++ b/testsuite/systemtap.syscall/rt_signal.c
@@ -20,30 +20,30 @@ int main()
   sigaddset(&mask, SIGUSR1);
   sigaddset(&mask, SIGUSR2);
   sigprocmask(SIG_BLOCK, &mask, NULL);
-  // rt_sigprocmask (SIG_BLOCK, \[SIGUSR1|SIGUSR2\], 0x[0]+, 8) = 0
+  //staptest// rt_sigprocmask (SIG_BLOCK, \[SIGUSR1|SIGUSR2\], 0x[0]+, 8) = 0
 
   sigdelset(&mask, SIGUSR2);
   sigprocmask(SIG_UNBLOCK, &mask, NULL);
-  // rt_sigprocmask (SIG_UNBLOCK, \[SIGUSR1\], 0x[0]+, 8) = 0
+  //staptest// rt_sigprocmask (SIG_UNBLOCK, \[SIGUSR1\], 0x[0]+, 8) = 0
 
   sa.sa_handler = SIG_IGN;
   sigemptyset(&sa.sa_mask);
   sigaddset(&sa.sa_mask, SIGALRM);
   sa.sa_flags = 0;
   sigaction(SIGUSR1, &sa, NULL);
-  // rt_sigaction (SIGUSR1, {SIG_IGN}, 0x[0]+, 8) = 0
+  //staptest// rt_sigaction (SIGUSR1, {SIG_IGN}, 0x[0]+, 8) = 0
 
   sa.sa_handler = SIG_DFL;
   sigaction(SIGUSR1, &sa, NULL);
-  // rt_sigaction (SIGUSR1, {SIG_DFL}, 0x[0]+, 8) = 0
+  //staptest// rt_sigaction (SIGUSR1, {SIG_DFL}, 0x[0]+, 8) = 0
   
   sa.sa_handler = sig_act_handler;
   sigaction(SIGUSR1, &sa, NULL);
 
 #ifdef __ia64__
-  // rt_sigaction (SIGUSR1, {XXXX, [^,]+, \[SIGALRM\]}, 0x[0]+, 8) = 0
+  //staptest// rt_sigaction (SIGUSR1, {XXXX, [^,]+, \[SIGALRM\]}, 0x[0]+, 8) = 0
 #else
-  // rt_sigaction (SIGUSR1, {XXXX, [^,]+, XXXX, \[SIGALRM\]}, 0x[0]+, 8) = 0
+  //staptest// rt_sigaction (SIGUSR1, {XXXX, [^,]+, XXXX, \[SIGALRM\]}, 0x[0]+, 8) = 0
 #endif
 
   return 0;
diff --git a/testsuite/systemtap.syscall/select.c b/testsuite/systemtap.syscall/select.c
index 6ea13a011..088211e28 100644
--- a/testsuite/systemtap.syscall/select.c
+++ b/testsuite/systemtap.syscall/select.c
@@ -17,20 +17,20 @@ int main()
   sigaddset(&sigs,SIGUSR2);
 
   select( 1, &rfds, NULL, NULL, &tv);
-  // select (1, XXXX, 0x[0]+, 0x[0]+, \[0.000117\])
+  //staptest// select (1, XXXX, 0x[0]+, 0x[0]+, \[0.000117\])
 
   tv.tv_sec = 0;
   tv.tv_usec = 113;
 
   select( 1, NULL, NULL, NULL, &tv);
-  // select (1, 0x[0]+, 0x[0]+, 0x[0]+, \[0.000113\])
+  //staptest// select (1, 0x[0]+, 0x[0]+, 0x[0]+, \[0.000113\])
 
 #ifdef SYS_pselect6
   pselect( 1, &rfds, NULL, NULL, &tim, &sigs);
-  //pselect[67] (1, XXXX, 0x[0]+, 0x[0]+, \[0.200000000\], XXXX)
+  //staptest//pselect[67] (1, XXXX, 0x[0]+, 0x[0]+, \[0.200000000\], XXXX)
 
   pselect( 0, NULL, NULL, NULL, &tim, &sigs);
-  // pselect[67] (0, 0x[0]+, 0x[0]+, 0x[0]+, \[0.200000000\], XXXX) =
+  //staptest// pselect[67] (0, 0x[0]+, 0x[0]+, 0x[0]+, \[0.200000000\], XXXX) =
 #endif
 
   return 0;
diff --git a/testsuite/systemtap.syscall/sendfile.c b/testsuite/systemtap.syscall/sendfile.c
index 06c6b2606..690d078e9 100644
--- a/testsuite/systemtap.syscall/sendfile.c
+++ b/testsuite/systemtap.syscall/sendfile.c
@@ -36,7 +36,7 @@ int main ()
 	 * sendfile will fail. So we test for failure here.
 	 */
 	ret = sendfile (write_fd, read_fd, &offset, stat_buf.st_size);
-	// sendfile (NNNN, NNNN, XXXX, 512) = -22 (EINVAL)
+	//staptest// sendfile (NNNN, NNNN, XXXX, 512) = -22 (EINVAL)
 
 	close (read_fd);
 	close (write_fd);
diff --git a/testsuite/systemtap.syscall/signal.c b/testsuite/systemtap.syscall/signal.c
index 2c0abe38d..e450c6d23 100644
--- a/testsuite/systemtap.syscall/signal.c
+++ b/testsuite/systemtap.syscall/signal.c
@@ -18,13 +18,13 @@ int main()
 
 #ifdef SYS_signal
   syscall(SYS_signal, SIGUSR1, SIG_IGN);
-  // signal (SIGUSR1, SIG_IGN)
+  //staptest// signal (SIGUSR1, SIG_IGN)
 
   syscall (SYS_signal, SIGUSR1, SIG_DFL);
-  // signal (SIGUSR1, SIG_DFL) = 1
+  //staptest// signal (SIGUSR1, SIG_DFL) = 1
 
   syscall (SYS_signal, SIGUSR1, sig_act_handler);
-  // signal (SIGUSR1, XXXX) = 0
+  //staptest// signal (SIGUSR1, XXXX) = 0
 #endif
 
   sigemptyset(&mask);
@@ -32,10 +32,10 @@ int main()
 
 #ifdef SYS_sigprocmask
   syscall (SYS_sigprocmask, SIG_BLOCK, &mask, NULL);
-  // sigprocmask (SIG_BLOCK, XXXX, 0x0+) = 0
+  //staptest// sigprocmask (SIG_BLOCK, XXXX, 0x0+) = 0
 
   syscall (SYS_sigprocmask, SIG_UNBLOCK, &mask, NULL);
-  // sigprocmask (SIG_UNBLOCK, XXXX, 0x0+) = 0
+  //staptest// sigprocmask (SIG_UNBLOCK, XXXX, 0x0+) = 0
 #endif
 
   memset(&sa, 0, sizeof(sa));
@@ -44,12 +44,12 @@ int main()
 
 #ifdef SYS_sigaction
   syscall (SYS_sigaction, SIGUSR1, &sa, NULL);
-  // sigaction (SIGUSR1, {SIG_IGN}, 0x0+) = 0
+  //staptest// sigaction (SIGUSR1, {SIG_IGN}, 0x0+) = 0
  #endif
 
 #ifdef SYS_tgkill
   syscall(SYS_tgkill, 1234, 5678, 0);
-  // tgkill (1234, 5678, SIG_0)
+  //staptest// tgkill (1234, 5678, SIG_0)
 #endif
 
   return 0;
diff --git a/testsuite/systemtap.syscall/stat.c b/testsuite/systemtap.syscall/stat.c
index 6be5cc791..d47c1440c 100644
--- a/testsuite/systemtap.syscall/stat.c
+++ b/testsuite/systemtap.syscall/stat.c
@@ -17,38 +17,38 @@ int main()
   struct utimbuf ubuf;
 
   getcwd(cwd, 128);
-  // getcwd (XXXX, 128) = NNNN
+  //staptest// getcwd (XXXX, 128) = NNNN
 
   fd = creat("foobar",S_IREAD|S_IWRITE);
-  // open ("foobar", O_WRONLY|O_CREAT|O_TRUNC, 0600) = NNNN
+  //staptest// open ("foobar", O_WRONLY|O_CREAT|O_TRUNC, 0600) = NNNN
 
   fstat(fd, &sbuf);
-  // fstat (NNNN, XXXX) = 0
+  //staptest// fstat (NNNN, XXXX) = 0
 
   close(fd);
 
   stat("foobar",&sbuf);
-  // stat ("foobar", XXXX) = 0
+  //staptest// stat ("foobar", XXXX) = 0
 
   lstat("foobar",&sbuf);
-  // lstat ("foobar", XXXX) = 0
+  //staptest// lstat ("foobar", XXXX) = 0
 
   ubuf.actime = 1;
   ubuf.modtime = 1135641600;
   utime("foobar", &ubuf);
 #ifdef __ia64__
-  // utimes ("foobar", \[1.000000\]\[1135641600.000000\]) =
+  //staptest// utimes ("foobar", \[1.000000\]\[1135641600.000000\]) =
 #else
-  // utime ("foobar", \[Thu Jan  1 00:00:01 1970, Tue Dec 27 00:00:00 2005\]) = 0
+  //staptest// utime ("foobar", \[Thu Jan  1 00:00:01 1970, Tue Dec 27 00:00:00 2005\]) = 0
 #endif
 
   ubuf.actime =  1135690000;
   ubuf.modtime = 1135700000;
   utime("foobar", &ubuf);
 #ifdef __ia64__
-  // utimes ("foobar", \[1135690000.000000\]\[1135700000.000000\]) =
+  //staptest// utimes ("foobar", \[1135690000.000000\]\[1135700000.000000\]) =
 #else
-  // utime ("foobar", \[Tue Dec 27 13:26:40 2005, Tue Dec 27 16:13:20 2005\]) = 0
+  //staptest// utime ("foobar", \[Tue Dec 27 13:26:40 2005, Tue Dec 27 16:13:20 2005\]) = 0
 #endif
   return 0;
 }
diff --git a/testsuite/systemtap.syscall/statfs.c b/testsuite/systemtap.syscall/statfs.c
index ea33193b8..eafce77e9 100644
--- a/testsuite/systemtap.syscall/statfs.c
+++ b/testsuite/systemtap.syscall/statfs.c
@@ -8,13 +8,13 @@ int main()
 {
   
   ustat(42, (struct ustat *)0x12345678);
-  // ustat (42, 0x0*12345678) = 
+  //staptest// ustat (42, 0x0*12345678) = 
 
   statfs("abc", (struct statfs *)0x12345678);
-  // statfs ("abc", 0x0*12345678) =
+  //staptest// statfs ("abc", 0x0*12345678) =
 
   fstatfs(77, (struct statfs *)0x12345678);
-  // fstatfs (77, 0x0*12345678) =
+  //staptest// fstatfs (77, 0x0*12345678) =
 
   return 0;
 }
diff --git a/testsuite/systemtap.syscall/swap.c b/testsuite/systemtap.syscall/swap.c
old mode 100755
new mode 100644
index 3708a4771..8fcf9946c
--- a/testsuite/systemtap.syscall/swap.c
+++ b/testsuite/systemtap.syscall/swap.c
@@ -6,22 +6,22 @@
 int main()
 {
   swapon("foobar_swap", 0);
-  // swapon ("foobar_swap", 0) =
+  //staptest// swapon ("foobar_swap", 0) =
 
   swapon("foobar_swap", ((1 << SWAP_FLAG_PRIO_SHIFT) & SWAP_FLAG_PRIO_MASK) | SWAP_FLAG_PREFER);
-  // swapon ("foobar_swap", 32769) =
+  //staptest// swapon ("foobar_swap", 32769) =
 
   swapon("foobar_swap", ((7 << SWAP_FLAG_PRIO_SHIFT) & SWAP_FLAG_PRIO_MASK) | SWAP_FLAG_PREFER);
-  // swapon ("foobar_swap", 32775) =
+  //staptest// swapon ("foobar_swap", 32775) =
 
   swapon(0, 0);
-  // swapon (NULL, 0) =
+  //staptest// swapon (NULL, 0) =
 
   swapoff("foobar_swap");
-  // swapoff ("foobar_swap") =
+  //staptest// swapoff ("foobar_swap") =
 
   swapoff(0);
-  // swapoff (NULL) =
+  //staptest// swapoff (NULL) =
 
   return 0;
 }
diff --git a/testsuite/systemtap.syscall/sync.c b/testsuite/systemtap.syscall/sync.c
index 637bc1975..d6e22203b 100644
--- a/testsuite/systemtap.syscall/sync.c
+++ b/testsuite/systemtap.syscall/sync.c
@@ -13,13 +13,13 @@ int main()
   fd = creat("foobar",S_IREAD|S_IWRITE);
 
   sync();
-  // sync () = 0
+  //staptest// sync () = 0
 
   fsync(fd);
-  // fsync (NNNN) = 0
+  //staptest// fsync (NNNN) = 0
 
   fdatasync(fd);
-  // fdatasync (NNNN) = 0
+  //staptest// fdatasync (NNNN) = 0
 
   close(fd);
 
diff --git a/testsuite/systemtap.syscall/test.tcl b/testsuite/systemtap.syscall/test.tcl
index db0df1388..efe48d202 100755
--- a/testsuite/systemtap.syscall/test.tcl
+++ b/testsuite/systemtap.syscall/test.tcl
@@ -40,22 +40,26 @@ proc run_one_test {filename flags} {
     target_compile $filename $dir/$testname executable $flags
     
     set sys_prog "[file dirname [file normalize $filename]]/sys.stp"
-    set cmd "stap -c $dir/${testname} ${sys_prog}"
+    set cmd "stap --skip-badvars -c $dir/${testname} ${sys_prog}"
     
     # Extract the expected results
     # Use the preprocessor so we can ifdef tests in and out
     
     set ccmd "gcc -E -C -P $filename"
+    # XXX: but note, this will expand all system headers too!
     catch {eval exec $ccmd} output
     
     set ind 0
     foreach line [split $output "\n"] {
-	if {[regsub {//} $line {} line]} {
+	if {[regsub {//staptest//} $line {} line]} {
 	    set line "$testname: [string trimleft $line]"
-	    
+
+	    # We need to quote all these metacharacters
 	    regsub -all {\(} $line {\\(} line
-		regsub -all {\)} $line {\\)} line
+	    regsub -all {\)} $line {\\)} line
 	    regsub -all {\|} $line {\|} line
+	    regsub -all {\+} $line {\\+} line
+	    regsub -all {\*} $line {\\*} line
 	    
 	    regsub -all NNNN $line {[\-0-9]+} line
 	    regsub -all XXXX $line {[x0-9a-fA-F]+} line
@@ -78,6 +82,7 @@ proc run_one_test {filename flags} {
     
     set i 0
     foreach line [split $output "\n"] {
+        # send_log "Comparing $results($i) against $line"
 	if {[regexp $results($i) $line]} {
 	    incr i
 	    if {$i >= $ind} {break}
diff --git a/testsuite/systemtap.syscall/timer.c b/testsuite/systemtap.syscall/timer.c
index 947f6a77a..9a55b2e81 100644
--- a/testsuite/systemtap.syscall/timer.c
+++ b/testsuite/systemtap.syscall/timer.c
@@ -13,19 +13,19 @@ int main()
   struct itimerspec val, oval;
 
   syscall(SYS_timer_create, CLOCK_REALTIME, NULL, &tid);
-  // timer_create (CLOCK_REALTIME, 0x[0]+, XXXX)
+  //staptest// timer_create (CLOCK_REALTIME, 0x[0]+, XXXX)
 
   syscall(SYS_timer_gettime, tid, &val);
-  // timer_gettime (NNNN, XXXX)
+  //staptest// timer_gettime (NNNN, XXXX)
 
   syscall(SYS_timer_settime, 0, tid, &val, &oval);
-  // timer_settime (0, NNNN, \[0.000000,0.000000\], XXXX)
+  //staptest// timer_settime (0, NNNN, \[0.000000,0.000000\], XXXX)
 
   syscall(SYS_timer_getoverrun, tid);
-  // timer_getoverrun (NNNN)
+  //staptest// timer_getoverrun (NNNN)
 
   syscall(SYS_timer_delete, tid);
-  // timer_delete (NNNN)
+  //staptest// timer_delete (NNNN)
 
   return 0;
 }
diff --git a/testsuite/systemtap.syscall/trunc.c b/testsuite/systemtap.syscall/trunc.c
index 39a524a79..ef2b0c683 100644
--- a/testsuite/systemtap.syscall/trunc.c
+++ b/testsuite/systemtap.syscall/trunc.c
@@ -13,11 +13,11 @@ int main()
 
   fd = creat("foobar",S_IREAD|S_IWRITE);
   ftruncate(fd, 1024);
-  // ftruncate (NNNN, 1024) = 0
+  //staptest// ftruncate (NNNN, 1024) = 0
   close(fd);
 
   truncate("foobar", 2048);
-  // truncate ("foobar", 2048) = 0
+  //staptest// truncate ("foobar", 2048) = 0
 
   return 0;
 }
diff --git a/testsuite/systemtap.syscall/uid.c b/testsuite/systemtap.syscall/uid.c
index 3acb4cb8d..6ccf8cdd0 100644
--- a/testsuite/systemtap.syscall/uid.c
+++ b/testsuite/systemtap.syscall/uid.c
@@ -11,54 +11,54 @@ int main ()
   gid_t rgid, egid, sgid;
 
   ruid = getuid();
-  // getuid () = NNNN
+  //staptest// getuid () = NNNN
   
   euid = geteuid();
-  // geteuid () = NNNN
+  //staptest// geteuid () = NNNN
   
   rgid = getgid();
-  // getgid () = NNNN
+  //staptest// getgid () = NNNN
 
   egid = getegid();
-  // getegid () = NNNN
+  //staptest// getegid () = NNNN
 
 
 
   setuid(4096);
-  // setuid (4096) = NNNN
+  //staptest// setuid (4096) = NNNN
 
   seteuid(4097);
-  // setresuid (-1, 4097, -1) = NNNN
+  //staptest// setresuid (-1, 4097, -1) = NNNN
 
   getresuid(&ruid, &euid, &suid);
-  // getresuid (XXXX, XXXX, XXXX) = 0
+  //staptest// getresuid (XXXX, XXXX, XXXX) = 0
 
   setgid(4098);
-  // setgid (4098) = NNNN
+  //staptest// setgid (4098) = NNNN
 
   setegid(4099);
-  // setresgid (-1, 4099, -1) = NNNN
+  //staptest// setresgid (-1, 4099, -1) = NNNN
 
   getresgid(&rgid, &egid, &sgid);
-  // getresgid (XXXX, XXXX, XXXX) = 0
+  //staptest// getresgid (XXXX, XXXX, XXXX) = 0
 
   setreuid(-1, 5000);
-  // setreuid (NNNN, 5000) =
+  //staptest// setreuid (NNNN, 5000) =
 
   setreuid(5001, -1);
-  // setreuid (5001, NNNN) =
+  //staptest// setreuid (5001, NNNN) =
 
   setregid(-1, 5002);
-  // setregid (NNNN, 5002) =
+  //staptest// setregid (NNNN, 5002) =
 
   setregid(5003, -1);
-  // setregid (5003, NNNN) =
+  //staptest// setregid (5003, NNNN) =
 
   setfsuid(5004);
-  // setfsuid (5004) = 
+  //staptest// setfsuid (5004) = 
 
   setfsgid(5005);
-  // setfsgid (5005) =
+  //staptest// setfsgid (5005) =
   
   return 0;
 }	
diff --git a/testsuite/systemtap.syscall/uid16.c b/testsuite/systemtap.syscall/uid16.c
index 2d7d33491..4f2fcff16 100644
--- a/testsuite/systemtap.syscall/uid16.c
+++ b/testsuite/systemtap.syscall/uid16.c
@@ -17,54 +17,54 @@ int main ()
 	gid_t gid, rgid, egid, sgid;
 
 	uid = syscall(__NR_getuid);
-	// getuid () = NNNN
+	//staptest// getuid () = NNNN
 
 	uid = syscall(__NR_geteuid);
-	// geteuid () = NNNN
+	//staptest// geteuid () = NNNN
 
 	gid = syscall(__NR_getgid);
-	// getgid () = NNNN
+	//staptest// getgid () = NNNN
 
 	gid = syscall(__NR_getegid);
-	// getegid () = NNNN
+	//staptest// getegid () = NNNN
 
 
 
 	syscall(__NR_setuid, 4096);
-	// setuid (4096) =
+	//staptest// setuid (4096) =
 
 	syscall(__NR_setresuid, -1, 4097, -1);
-	// setresuid (-1, 4097, -1) =
+	//staptest// setresuid (-1, 4097, -1) =
 
 	syscall(__NR_getresuid, &ruid, &euid, &suid);
-	// getresuid (XXXX, XXXX, XXXX) =
+	//staptest// getresuid (XXXX, XXXX, XXXX) =
 
 	syscall(__NR_setgid, 4098);
-	// setgid (4098) =
+	//staptest// setgid (4098) =
 
 	syscall(__NR_setresgid, -1, 4099, -1);
-	// setresgid (-1, 4099, -1) =
+	//staptest// setresgid (-1, 4099, -1) =
 	
 	syscall(__NR_getresgid, &rgid, &egid, &sgid);
-	// getresgid (XXXX, XXXX, XXXX) =
+	//staptest// getresgid (XXXX, XXXX, XXXX) =
 
 	syscall(__NR_setreuid, -1, 5000);
-	// setreuid (-1, 5000) = 
+	//staptest// setreuid (-1, 5000) = 
 
 	syscall(__NR_setreuid, 5001, -1);
-	// setreuid (5001, -1) = 
+	//staptest// setreuid (5001, -1) = 
 
 	syscall(__NR_setregid, -1, 5002);
-	// setregid (-1, 5002) = 
+	//staptest// setregid (-1, 5002) = 
 
 	syscall(__NR_setregid, 5003, -1);
-	// setregid (5003, -1) = 
+	//staptest// setregid (5003, -1) = 
 
 	syscall(__NR_setfsuid, 5004);
-	// setfsuid (5004) = 
+	//staptest// setfsuid (5004) = 
 	
 	syscall(__NR_setfsgid, 5005);
-	// setfsgid (5005) =
+	//staptest// setfsgid (5005) =
 
 #endif /* __i386__ */
 
diff --git a/testsuite/systemtap.syscall/umask.c b/testsuite/systemtap.syscall/umask.c
index 5d13575fe..0a3d05340 100644
--- a/testsuite/systemtap.syscall/umask.c
+++ b/testsuite/systemtap.syscall/umask.c
@@ -5,16 +5,16 @@
 int main()
 {
   umask (0);
-  // umask (00) = NNNN
+  //staptest// umask (00) = NNNN
   umask (7);
-  // umask (07) = 00
+  //staptest// umask (07) = 00
   umask (077);
-  // umask (077) = 07
+  //staptest// umask (077) = 07
   umask (0666);
-  // umask (0666) = 077
+  //staptest// umask (0666) = 077
   umask (0777);
-  // umask (0777) = 0666
+  //staptest// umask (0777) = 0666
   umask (01777);
-  // umask (01777) = 0777
+  //staptest// umask (01777) = 0777
   return 0;
 }
diff --git a/testsuite/systemtap.syscall/unlink.c b/testsuite/systemtap.syscall/unlink.c
index b0d00be88..33fe61576 100644
--- a/testsuite/systemtap.syscall/unlink.c
+++ b/testsuite/systemtap.syscall/unlink.c
@@ -14,22 +14,22 @@ int main()
   close (fd1);
   
   unlink("foobar1");
-  // unlink ("foobar1") = 0
+  //staptest// unlink ("foobar1") = 0
 
   unlink("foobar1");
-  // unlink ("foobar1") = -NNNN (ENOENT)
+  //staptest// unlink ("foobar1") = -NNNN (ENOENT)
 
   unlink("foobar2");
-  // unlink ("foobar2") = -NNNN (ENOENT)
+  //staptest// unlink ("foobar2") = -NNNN (ENOENT)
 
   unlink(0);
-  // unlink (NULL) = -NNNN (EFAULT)
+  //staptest// unlink (NULL) = -NNNN (EFAULT)
 
   unlink("..");
-  // unlink ("..") = -NNNN (EISDIR)
+  //staptest// unlink ("..") = -NNNN (EISDIR)
 
   unlink("");
-  // unlink ("") = -NNNN (ENOENT)
+  //staptest// unlink ("") = -NNNN (ENOENT)
 
   return 0;
 }
-- 
2.43.5