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: 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/clock.c | 38 ++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'testsuite/systemtap.syscall/clock.c')

diff --git a/testsuite/systemtap.syscall/clock.c b/testsuite/systemtap.syscall/clock.c
index bc84871d..995d59df 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;
 }
-- 
cgit