|
From: <sv...@va...> - 2009-04-16 01:48:23
|
Author: njn
Date: 2009-04-16 02:35:29 +0100 (Thu, 16 Apr 2009)
New Revision: 9563
Log:
Merged r9562 (kill nanoleak.vgtest) from the trunk.
Added:
branches/DARWIN/memcheck/tests/nanoleak_supp.c
Removed:
branches/DARWIN/memcheck/tests/nanoleak.c
branches/DARWIN/memcheck/tests/nanoleak.stderr.exp
branches/DARWIN/memcheck/tests/nanoleak.vgtest
Modified:
branches/DARWIN/memcheck/tests/Makefile.am
branches/DARWIN/memcheck/tests/nanoleak_supp.vgtest
Modified: branches/DARWIN/memcheck/tests/Makefile.am
===================================================================
--- branches/DARWIN/memcheck/tests/Makefile.am 2009-04-16 01:28:08 UTC (rev 9562)
+++ branches/DARWIN/memcheck/tests/Makefile.am 2009-04-16 01:35:29 UTC (rev 9563)
@@ -97,7 +97,6 @@
metadata.stderr.exp metadata.stdout.exp metadata.vgtest \
mismatches.stderr.exp mismatches.vgtest \
mmaptest.stderr.exp mmaptest.vgtest \
- nanoleak.stderr.exp nanoleak.vgtest \
nanoleak_supp.stderr.exp nanoleak_supp.vgtest nanoleak.supp \
nanoleak2.stderr.exp nanoleak2.vgtest \
new_nothrow.stderr.exp new_nothrow.vgtest \
@@ -201,7 +200,7 @@
match-overrun \
memalign_test memalign2 memcmptest mempool mmaptest \
mismatches new_override metadata \
- nanoleak nanoleak2 new_nothrow \
+ nanoleak_supp nanoleak2 new_nothrow \
noisy_child \
null_socket \
origin1-yes origin2-not-quite origin3-no \
Deleted: branches/DARWIN/memcheck/tests/nanoleak.c
===================================================================
--- branches/DARWIN/memcheck/tests/nanoleak.c 2009-04-16 01:28:08 UTC (rev 9562)
+++ branches/DARWIN/memcheck/tests/nanoleak.c 2009-04-16 01:35:29 UTC (rev 9563)
@@ -1,9 +0,0 @@
-
-#include <stdlib.h>
-
-int main ( void )
-{
- volatile int* a = malloc(1000);
- a[0] = 0;
- return a[0];
-}
Deleted: branches/DARWIN/memcheck/tests/nanoleak.stderr.exp
===================================================================
--- branches/DARWIN/memcheck/tests/nanoleak.stderr.exp 2009-04-16 01:28:08 UTC (rev 9562)
+++ branches/DARWIN/memcheck/tests/nanoleak.stderr.exp 2009-04-16 01:35:29 UTC (rev 9563)
@@ -1,4 +0,0 @@
-
-1,000 bytes in 1 blocks are definitely lost in loss record ... of ...
- at 0x........: malloc (vg_replace_malloc.c:...)
- by 0x........: main (nanoleak.c:6)
Deleted: branches/DARWIN/memcheck/tests/nanoleak.vgtest
===================================================================
--- branches/DARWIN/memcheck/tests/nanoleak.vgtest 2009-04-16 01:28:08 UTC (rev 9562)
+++ branches/DARWIN/memcheck/tests/nanoleak.vgtest 2009-04-16 01:35:29 UTC (rev 9563)
@@ -1,2 +0,0 @@
-vgopts: --leak-check=yes -q
-prog: nanoleak
Copied: branches/DARWIN/memcheck/tests/nanoleak_supp.c (from rev 9562, trunk/memcheck/tests/nanoleak_supp.c)
===================================================================
--- branches/DARWIN/memcheck/tests/nanoleak_supp.c (rev 0)
+++ branches/DARWIN/memcheck/tests/nanoleak_supp.c 2009-04-16 01:35:29 UTC (rev 9563)
@@ -0,0 +1,9 @@
+
+#include <stdlib.h>
+
+int main ( void )
+{
+ volatile int* a = malloc(1000);
+ a[0] = 0;
+ return a[0];
+}
Modified: branches/DARWIN/memcheck/tests/nanoleak_supp.vgtest
===================================================================
--- branches/DARWIN/memcheck/tests/nanoleak_supp.vgtest 2009-04-16 01:28:08 UTC (rev 9562)
+++ branches/DARWIN/memcheck/tests/nanoleak_supp.vgtest 2009-04-16 01:35:29 UTC (rev 9563)
@@ -1,2 +1,2 @@
vgopts: --leak-check=yes --suppressions=nanoleak.supp -q
-prog: nanoleak
+prog: nanoleak_supp
|