|
From: <sv...@va...> - 2009-01-23 00:57:39
|
Author: njn
Date: 2009-01-23 00:57:31 +0000 (Fri, 23 Jan 2009)
New Revision: 9038
Log:
Move memcheck/tests/brk to the linux/ subdir, as it's Linux-specific (merged
from the DARWIN branch). Also filter the output more so the .stderr.exp2
isn't needed.
Added:
trunk/memcheck/tests/linux/brk.c
trunk/memcheck/tests/linux/brk.stderr.exp
trunk/memcheck/tests/linux/brk.vgtest
Removed:
trunk/memcheck/tests/brk.c
trunk/memcheck/tests/brk.stderr.exp
trunk/memcheck/tests/brk.stderr.exp2
trunk/memcheck/tests/brk.vgtest
Modified:
trunk/memcheck/tests/Makefile.am
trunk/memcheck/tests/linux/Makefile.am
Modified: trunk/memcheck/tests/Makefile.am
===================================================================
--- trunk/memcheck/tests/Makefile.am 2009-01-23 00:02:07 UTC (rev 9037)
+++ trunk/memcheck/tests/Makefile.am 2009-01-23 00:57:31 UTC (rev 9038)
@@ -39,7 +39,6 @@
badloop.stderr.exp badloop.vgtest \
badpoll.stderr.exp badpoll.vgtest \
badrw.stderr.exp badrw.vgtest \
- brk.stderr.exp brk.vgtest \
brk2.stderr.exp brk2.vgtest \
buflen_check.stderr.exp buflen_check.stderr.exp2 buflen_check.vgtest \
clientperm.stderr.exp \
@@ -186,7 +185,7 @@
check_PROGRAMS = \
addressable \
badaddrvalue badfree badjump badjump2 \
- badloop badpoll badrw brk brk2 buflen_check \
+ badloop badpoll badrw brk2 buflen_check \
clientperm custom_alloc \
deep_templates \
describe-block \
Deleted: trunk/memcheck/tests/brk.c
===================================================================
--- trunk/memcheck/tests/brk.c 2009-01-23 00:02:07 UTC (rev 9037)
+++ trunk/memcheck/tests/brk.c 2009-01-23 00:57:31 UTC (rev 9038)
@@ -1,44 +0,0 @@
-#include <assert.h>
-#include <stdio.h>
-#if !defined(_AIX)
-# include <sys/syscall.h>
-#endif
-#include <sys/types.h>
-#include <unistd.h>
-
-// kernel brk() and libc brk() act quite differently...
-
-int main(void)
-{
- int i;
- void* orig_ds = sbrk(0);
- void* ds = orig_ds;
- void* vals[10];
- void* res;
-#define EOL ((void*)( ~(long)0 ))
- vals[0] = (void*)0;
- vals[1] = (void*)1;
- vals[2] = ds - 0x1; // small shrink
- vals[3] = ds;
- vals[4] = ds + 0x1000; // small growth
- vals[5] = ds + 0x40000000; // too-big growth
- vals[6] = ds + 0x500; // shrink a little, but still above start size
- vals[7] = ds - 0x1; // shrink below start size
-// vals[8] = ds - 0x1000; // shrink a lot below start size (into text)
-// vals[9] = EOL;
- vals[8] = EOL;
-
- for (i = 0; EOL != vals[i]; i++) {
-# if !defined(_AIX)
- res = (void*)syscall(__NR_brk, vals[i]);
-# endif
- }
-
- assert( 0 == brk(orig_ds) ); // libc brk()
-
- for (i = 0; EOL != vals[i]; i++) {
- res = (void*)(long)brk(vals[i]);
- }
-
- return 0;
-}
Deleted: trunk/memcheck/tests/brk.stderr.exp
===================================================================
--- trunk/memcheck/tests/brk.stderr.exp 2009-01-23 00:02:07 UTC (rev 9037)
+++ trunk/memcheck/tests/brk.stderr.exp 2009-01-23 00:57:31 UTC (rev 9038)
@@ -1,7 +0,0 @@
-
-
-ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
-malloc/free: in use at exit: 0 bytes in 0 blocks.
-malloc/free: 0 allocs, 0 frees, 0 bytes allocated.
-For a detailed leak analysis, rerun with: --leak-check=yes
-For counts of detected errors, rerun with: -v
Deleted: trunk/memcheck/tests/brk.stderr.exp2
===================================================================
--- trunk/memcheck/tests/brk.stderr.exp2 2009-01-23 00:02:07 UTC (rev 9037)
+++ trunk/memcheck/tests/brk.stderr.exp2 2009-01-23 00:57:31 UTC (rev 9038)
@@ -1,7 +0,0 @@
-
-
-ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
-malloc/free: in use at exit: 0 bytes in 0 blocks.
-malloc/free: 1 allocs, 1 frees, 24 bytes allocated.
-For a detailed leak analysis, rerun with: --leak-check=yes
-For counts of detected errors, rerun with: -v
Deleted: trunk/memcheck/tests/brk.vgtest
===================================================================
--- trunk/memcheck/tests/brk.vgtest 2009-01-23 00:02:07 UTC (rev 9037)
+++ trunk/memcheck/tests/brk.vgtest 2009-01-23 00:57:31 UTC (rev 9038)
@@ -1 +0,0 @@
-prog: brk
Modified: trunk/memcheck/tests/linux/Makefile.am
===================================================================
--- trunk/memcheck/tests/linux/Makefile.am 2009-01-23 00:02:07 UTC (rev 9037)
+++ trunk/memcheck/tests/linux/Makefile.am 2009-01-23 00:57:31 UTC (rev 9038)
@@ -1,10 +1,12 @@
noinst_SCRIPTS = filter_stderr
EXTRA_DIST = $(noinst_SCRIPTS) \
+ brk.stderr.exp brk.vgtest \
capget capget.stderr.exp \
timerfd-syscall timerfd-syscall.stderr.exp
check_PROGRAMS = \
+ brk \
capget \
timerfd-syscall
Copied: trunk/memcheck/tests/linux/brk.c (from rev 9031, trunk/memcheck/tests/brk.c)
===================================================================
--- trunk/memcheck/tests/linux/brk.c (rev 0)
+++ trunk/memcheck/tests/linux/brk.c 2009-01-23 00:57:31 UTC (rev 9038)
@@ -0,0 +1,44 @@
+#include <assert.h>
+#include <stdio.h>
+#if !defined(_AIX)
+# include <sys/syscall.h>
+#endif
+#include <sys/types.h>
+#include <unistd.h>
+
+// kernel brk() and libc brk() act quite differently...
+
+int main(void)
+{
+ int i;
+ void* orig_ds = sbrk(0);
+ void* ds = orig_ds;
+ void* vals[10];
+ void* res;
+#define EOL ((void*)( ~(long)0 ))
+ vals[0] = (void*)0;
+ vals[1] = (void*)1;
+ vals[2] = ds - 0x1; // small shrink
+ vals[3] = ds;
+ vals[4] = ds + 0x1000; // small growth
+ vals[5] = ds + 0x40000000; // too-big growth
+ vals[6] = ds + 0x500; // shrink a little, but still above start size
+ vals[7] = ds - 0x1; // shrink below start size
+// vals[8] = ds - 0x1000; // shrink a lot below start size (into text)
+// vals[9] = EOL;
+ vals[8] = EOL;
+
+ for (i = 0; EOL != vals[i]; i++) {
+# if !defined(_AIX)
+ res = (void*)syscall(__NR_brk, vals[i]);
+# endif
+ }
+
+ assert( 0 == brk(orig_ds) ); // libc brk()
+
+ for (i = 0; EOL != vals[i]; i++) {
+ res = (void*)(long)brk(vals[i]);
+ }
+
+ return 0;
+}
Property changes on: trunk/memcheck/tests/linux/brk.c
___________________________________________________________________
Name: svn:keywords
+ author date id revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ native
Copied: trunk/memcheck/tests/linux/brk.stderr.exp (from rev 9031, trunk/memcheck/tests/brk.stderr.exp)
===================================================================
--- trunk/memcheck/tests/linux/brk.stderr.exp (rev 0)
+++ trunk/memcheck/tests/linux/brk.stderr.exp 2009-01-23 00:57:31 UTC (rev 9038)
@@ -0,0 +1,7 @@
+
+
+ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
+malloc/free: in use at exit: ... bytes in ... blocks.
+malloc/free: ... allocs, ... frees, ... bytes allocated.
+For a detailed leak analysis, rerun with: --leak-check=yes
+For counts of detected errors, rerun with: -v
Property changes on: trunk/memcheck/tests/linux/brk.stderr.exp
___________________________________________________________________
Name: svn:keywords
+ author date id revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ native
Copied: trunk/memcheck/tests/linux/brk.vgtest (from rev 9031, trunk/memcheck/tests/brk.vgtest)
===================================================================
--- trunk/memcheck/tests/linux/brk.vgtest (rev 0)
+++ trunk/memcheck/tests/linux/brk.vgtest 2009-01-23 00:57:31 UTC (rev 9038)
@@ -0,0 +1,2 @@
+prog: brk
+stderr_filter: ../filter_allocs
Property changes on: trunk/memcheck/tests/linux/brk.vgtest
___________________________________________________________________
Name: svn:keywords
+ author date id revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ native
|