diff options
| author | Frank Ch. Eigler <fche@elastic.org> | 2009-04-30 17:07:43 -0400 |
|---|---|---|
| committer | Frank Ch. Eigler <fche@elastic.org> | 2009-04-30 17:07:43 -0400 |
| commit | 059cd9efbd82e1017406a7a290a2fb9f6bfb64f7 (patch) | |
| tree | 8ab74af55066fd93c30682da09014aa81e3339ef /testsuite/systemtap.syscall/net1.c | |
| parent | c12f7fa15eec148307fa94f886b0673c1d0dd789 (diff) | |
| download | systemtap-steved-059cd9efbd82e1017406a7a290a2fb9f6bfb64f7.tar.gz systemtap-steved-059cd9efbd82e1017406a7a290a2fb9f6bfb64f7.tar.xz systemtap-steved-059cd9efbd82e1017406a7a290a2fb9f6bfb64f7.zip | |
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.
Diffstat (limited to 'testsuite/systemtap.syscall/net1.c')
| -rw-r--r-- | testsuite/systemtap.syscall/net1.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/testsuite/systemtap.syscall/net1.c b/testsuite/systemtap.syscall/net1.c index 219a3860..f8079ffd 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); |