|
From: <sv...@va...> - 2009-01-23 00:02:15
|
Author: njn Date: 2009-01-23 00:02:07 +0000 (Fri, 23 Jan 2009) New Revision: 9037 Log: Merge some minor regtest updates from the DARWIN branch: - avoid using <malloc.h> where it's not necessary, because on DARWIN it's called <malloc/malloc.h> - filter the output of brk2 more, which allows the .stderr.exp2 file to be removed. Removed: trunk/memcheck/tests/brk2.stderr.exp2 Modified: trunk/memcheck/tests/brk2.stderr.exp trunk/memcheck/tests/brk2.vgtest trunk/memcheck/tests/origin5-bz2.c trunk/memcheck/tests/partiallydefinedeq.c trunk/memcheck/tests/varinfo6.c trunk/memcheck/tests/wrap5.c trunk/memcheck/tests/wrap8.c trunk/none/tests/x86/bug137714-x86.c Modified: trunk/memcheck/tests/brk2.stderr.exp =================================================================== --- trunk/memcheck/tests/brk2.stderr.exp 2009-01-22 23:00:18 UTC (rev 9036) +++ trunk/memcheck/tests/brk2.stderr.exp 2009-01-23 00:02:07 UTC (rev 9037) @@ -1,7 +1,7 @@ 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. +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 Deleted: trunk/memcheck/tests/brk2.stderr.exp2 =================================================================== --- trunk/memcheck/tests/brk2.stderr.exp2 2009-01-22 23:00:18 UTC (rev 9036) +++ trunk/memcheck/tests/brk2.stderr.exp2 2009-01-23 00:02:07 UTC (rev 9037) @@ -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 Modified: trunk/memcheck/tests/brk2.vgtest =================================================================== --- trunk/memcheck/tests/brk2.vgtest 2009-01-22 23:00:18 UTC (rev 9036) +++ trunk/memcheck/tests/brk2.vgtest 2009-01-23 00:02:07 UTC (rev 9037) @@ -1 +1,2 @@ prog: brk2 +stderr_filter: filter_allocs Modified: trunk/memcheck/tests/origin5-bz2.c =================================================================== --- trunk/memcheck/tests/origin5-bz2.c 2009-01-22 23:00:18 UTC (rev 9036) +++ trunk/memcheck/tests/origin5-bz2.c 2009-01-23 00:02:07 UTC (rev 9037) @@ -6412,8 +6412,8 @@ my_strcat(inbuf, "\n"); } + #include <stdio.h> -#include <malloc.h> #include <assert.h> /* For providing services. */ Modified: trunk/memcheck/tests/partiallydefinedeq.c =================================================================== --- trunk/memcheck/tests/partiallydefinedeq.c 2009-01-22 23:00:18 UTC (rev 9036) +++ trunk/memcheck/tests/partiallydefinedeq.c 2009-01-23 00:02:07 UTC (rev 9037) @@ -1,6 +1,6 @@ #include <stdio.h> -#include <malloc.h> +#include <stdlib.h> // Do a test comparison. By default memcheck does not use the // expensive EQ/NE scheme as it would be too expensive. The Modified: trunk/memcheck/tests/varinfo6.c =================================================================== --- trunk/memcheck/tests/varinfo6.c 2009-01-22 23:00:18 UTC (rev 9036) +++ trunk/memcheck/tests/varinfo6.c 2009-01-23 00:02:07 UTC (rev 9037) @@ -6449,8 +6449,8 @@ my_strcat(inbuf, "\n"); } + #include <stdio.h> -#include <malloc.h> #include <assert.h> /* For providing services. */ Modified: trunk/memcheck/tests/wrap5.c =================================================================== --- trunk/memcheck/tests/wrap5.c 2009-01-22 23:00:18 UTC (rev 9036) +++ trunk/memcheck/tests/wrap5.c 2009-01-23 00:02:07 UTC (rev 9037) @@ -1,6 +1,5 @@ #include <stdio.h> -#include <malloc.h> #include <stdlib.h> #include "valgrind.h" Modified: trunk/memcheck/tests/wrap8.c =================================================================== --- trunk/memcheck/tests/wrap8.c 2009-01-22 23:00:18 UTC (rev 9036) +++ trunk/memcheck/tests/wrap8.c 2009-01-23 00:02:07 UTC (rev 9037) @@ -1,6 +1,5 @@ #include <unistd.h> #include <stdio.h> -#include <malloc.h> #include <stdlib.h> #include "valgrind.h" Modified: trunk/none/tests/x86/bug137714-x86.c =================================================================== --- trunk/none/tests/x86/bug137714-x86.c 2009-01-22 23:00:18 UTC (rev 9036) +++ trunk/none/tests/x86/bug137714-x86.c 2009-01-23 00:02:07 UTC (rev 9037) @@ -1,6 +1,6 @@ #include <stdio.h> -#include <malloc.h> +#include <stdlib.h> #include <assert.h> typedef unsigned char UChar; |