|
From: <sv...@va...> - 2008-06-27 07:33:24
|
Author: bart Date: 2008-06-27 08:33:18 +0100 (Fri, 27 Jun 2008) New Revision: 8285 Log: Added extra filtering for the stderr output of malloc_free_fill such that the output of this test becomes independent of the Linux distribution the test is run on. Should fix #162819. Added: trunk/memcheck/tests/filter_malloc_free_fill trunk/memcheck/tests/malloc_free_fill.stderr.exp Removed: trunk/memcheck/tests/malloc_free_fill.stderr.exp-glibc25-amd64 trunk/memcheck/tests/malloc_free_fill.stderr.exp-glibc25-x86 trunk/memcheck/tests/malloc_free_fill.stderr.exp-glibc27-amd64 Modified: trunk/memcheck/tests/Makefile.am trunk/memcheck/tests/malloc_free_fill.vgtest Modified: trunk/memcheck/tests/Makefile.am =================================================================== --- trunk/memcheck/tests/Makefile.am 2008-06-26 08:58:25 UTC (rev 8284) +++ trunk/memcheck/tests/Makefile.am 2008-06-27 07:33:18 UTC (rev 8285) @@ -75,8 +75,7 @@ lsframe2.vgtest lsframe2.stdout.exp lsframe2.stderr.exp \ mallinfo.stderr.exp mallinfo.vgtest \ malloc_free_fill.vgtest malloc_free_fill.stdout.exp \ - malloc_free_fill.stderr.exp-glibc25-amd64 \ - malloc_free_fill.stderr.exp-glibc25-x86 \ + malloc_free_fill.stderr.exp \ malloc_usable.stderr.exp malloc_usable.vgtest \ malloc1.stderr.exp malloc1.vgtest \ malloc2.stderr.exp malloc2.vgtest \ Added: trunk/memcheck/tests/filter_malloc_free_fill =================================================================== --- trunk/memcheck/tests/filter_malloc_free_fill (rev 0) +++ trunk/memcheck/tests/filter_malloc_free_fill 2008-06-27 07:33:18 UTC (rev 8285) @@ -0,0 +1,5 @@ +#! /bin/sh + +./filter_stderr | +sed -e 's|^Use of uninitialised value of size [0-9]*$|Use of uninitialised value of size .|g' \ + -e 's|^ at 0x\.\.\.\.\.\.\.\.: _itoa_word (in /\.\.\.libc\.\.\.)$| at 0x........: (within /...libc...)|g' Property changes on: trunk/memcheck/tests/filter_malloc_free_fill ___________________________________________________________________ Name: svn:executable + * Copied: trunk/memcheck/tests/malloc_free_fill.stderr.exp (from rev 8284, trunk/memcheck/tests/malloc_free_fill.stderr.exp-glibc27-amd64) =================================================================== --- trunk/memcheck/tests/malloc_free_fill.stderr.exp (rev 0) +++ trunk/memcheck/tests/malloc_free_fill.stderr.exp 2008-06-27 07:33:18 UTC (rev 8285) @@ -0,0 +1,58 @@ + +test simple malloc/free: +Use of uninitialised value of size . + at 0x........: (within /...libc...) + by 0x........: ... + by 0x........: ... + by 0x........: ... + by 0x........: ... + by 0x........: main (malloc_free_fill.c:17) + +Conditional jump or move depends on uninitialised value(s) + at 0x........: (within /...libc...) + by 0x........: ... + by 0x........: ... + by 0x........: ... + by 0x........: ... + by 0x........: main (malloc_free_fill.c:17) + +Conditional jump or move depends on uninitialised value(s) + at 0x........: vfprintf (in /...libc...) + by 0x........: ... + by 0x........: ... + by 0x........: ... + by 0x........: main (malloc_free_fill.c:17) +(should be malloc-filled) a[4] = 55555555 + +Invalid read of size 4 + at 0x........: main (malloc_free_fill.c:20) + Address 0x........ is 20 bytes inside a block of size 40 free'd + at 0x........: free (vg_replace_malloc.c:...) + by 0x........: main (malloc_free_fill.c:19) +(should be free-filled) a[5] = 77777777 +test realloc-larger: +(should be malloc-filled) r[25] = 55555555 + +Invalid read of size 4 + at 0x........: main (malloc_free_fill.c:33) + Address 0x........ is 104 bytes inside a block of size 120 free'd + at 0x........: realloc (vg_replace_malloc.c:...) + by 0x........: main (malloc_free_fill.c:31) +(should be free-filled) oldr[26] = 77777777 +(should be malloc-filled) r[35] = 55555555 +test realloc-smaller: +(should be malloc-filled) r[25] = 55555555 + +Invalid read of size 4 + at 0x........: main (malloc_free_fill.c:49) + Address 0x........ is not stack'd, malloc'd or (recently) free'd +(should be free-filled) oldr[26] = 77777777 +test calloc: +(should be zero) a[42] = 0 + +ERROR SUMMARY: 67 errors from 6 contexts (suppressed: 0 from 0) +malloc/free: in use at exit: 0 bytes in 0 blocks. +malloc/free: 6 allocs, 6 frees, 920 bytes allocated. +For a detailed leak analysis, rerun with: --leak-check=yes +For counts of detected errors, rerun with: -v +Use --track-origins=yes to see where uninitialised values come from Property changes on: trunk/memcheck/tests/malloc_free_fill.stderr.exp ___________________________________________________________________ Name: svn:mergeinfo + Deleted: trunk/memcheck/tests/malloc_free_fill.stderr.exp-glibc25-amd64 =================================================================== --- trunk/memcheck/tests/malloc_free_fill.stderr.exp-glibc25-amd64 2008-06-26 08:58:25 UTC (rev 8284) +++ trunk/memcheck/tests/malloc_free_fill.stderr.exp-glibc25-amd64 2008-06-27 07:33:18 UTC (rev 8285) @@ -1,58 +0,0 @@ - -test simple malloc/free: -Use of uninitialised value of size 8 - at 0x........: _itoa_word (in /...libc...) - by 0x........: ... - by 0x........: ... - by 0x........: ... - by 0x........: ... - by 0x........: main (malloc_free_fill.c:17) - -Conditional jump or move depends on uninitialised value(s) - at 0x........: _itoa_word (in /...libc...) - by 0x........: ... - by 0x........: ... - by 0x........: ... - by 0x........: ... - by 0x........: main (malloc_free_fill.c:17) - -Conditional jump or move depends on uninitialised value(s) - at 0x........: vfprintf (in /...libc...) - by 0x........: ... - by 0x........: ... - by 0x........: ... - by 0x........: main (malloc_free_fill.c:17) -(should be malloc-filled) a[4] = 55555555 - -Invalid read of size 4 - at 0x........: main (malloc_free_fill.c:20) - Address 0x........ is 20 bytes inside a block of size 40 free'd - at 0x........: free (vg_replace_malloc.c:...) - by 0x........: main (malloc_free_fill.c:19) -(should be free-filled) a[5] = 77777777 -test realloc-larger: -(should be malloc-filled) r[25] = 55555555 - -Invalid read of size 4 - at 0x........: main (malloc_free_fill.c:33) - Address 0x........ is 104 bytes inside a block of size 120 free'd - at 0x........: realloc (vg_replace_malloc.c:...) - by 0x........: main (malloc_free_fill.c:31) -(should be free-filled) oldr[26] = 77777777 -(should be malloc-filled) r[35] = 55555555 -test realloc-smaller: -(should be malloc-filled) r[25] = 55555555 - -Invalid read of size 4 - at 0x........: main (malloc_free_fill.c:49) - Address 0x........ is not stack'd, malloc'd or (recently) free'd -(should be free-filled) oldr[26] = 77777777 -test calloc: -(should be zero) a[42] = 0 - -ERROR SUMMARY: 67 errors from 6 contexts (suppressed: 0 from 0) -malloc/free: in use at exit: 0 bytes in 0 blocks. -malloc/free: 6 allocs, 6 frees, 920 bytes allocated. -For a detailed leak analysis, rerun with: --leak-check=yes -For counts of detected errors, rerun with: -v -Use --track-origins=yes to see where uninitialised values come from Deleted: trunk/memcheck/tests/malloc_free_fill.stderr.exp-glibc25-x86 =================================================================== --- trunk/memcheck/tests/malloc_free_fill.stderr.exp-glibc25-x86 2008-06-26 08:58:25 UTC (rev 8284) +++ trunk/memcheck/tests/malloc_free_fill.stderr.exp-glibc25-x86 2008-06-27 07:33:18 UTC (rev 8285) @@ -1,58 +0,0 @@ - -test simple malloc/free: -Use of uninitialised value of size 4 - at 0x........: _itoa_word (in /...libc...) - by 0x........: ... - by 0x........: ... - by 0x........: ... - by 0x........: ... - by 0x........: main (malloc_free_fill.c:17) - -Conditional jump or move depends on uninitialised value(s) - at 0x........: _itoa_word (in /...libc...) - by 0x........: ... - by 0x........: ... - by 0x........: ... - by 0x........: ... - by 0x........: main (malloc_free_fill.c:17) - -Conditional jump or move depends on uninitialised value(s) - at 0x........: vfprintf (in /...libc...) - by 0x........: ... - by 0x........: ... - by 0x........: ... - by 0x........: main (malloc_free_fill.c:17) -(should be malloc-filled) a[4] = 55555555 - -Invalid read of size 4 - at 0x........: main (malloc_free_fill.c:20) - Address 0x........ is 20 bytes inside a block of size 40 free'd - at 0x........: free (vg_replace_malloc.c:...) - by 0x........: main (malloc_free_fill.c:19) -(should be free-filled) a[5] = 77777777 -test realloc-larger: -(should be malloc-filled) r[25] = 55555555 - -Invalid read of size 4 - at 0x........: main (malloc_free_fill.c:33) - Address 0x........ is 104 bytes inside a block of size 120 free'd - at 0x........: realloc (vg_replace_malloc.c:...) - by 0x........: main (malloc_free_fill.c:31) -(should be free-filled) oldr[26] = 77777777 -(should be malloc-filled) r[35] = 55555555 -test realloc-smaller: -(should be malloc-filled) r[25] = 55555555 - -Invalid read of size 4 - at 0x........: main (malloc_free_fill.c:49) - Address 0x........ is not stack'd, malloc'd or (recently) free'd -(should be free-filled) oldr[26] = 77777777 -test calloc: -(should be zero) a[42] = 0 - -ERROR SUMMARY: 67 errors from 6 contexts (suppressed: 0 from 0) -malloc/free: in use at exit: 0 bytes in 0 blocks. -malloc/free: 6 allocs, 6 frees, 920 bytes allocated. -For a detailed leak analysis, rerun with: --leak-check=yes -For counts of detected errors, rerun with: -v -Use --track-origins=yes to see where uninitialised values come from Deleted: trunk/memcheck/tests/malloc_free_fill.stderr.exp-glibc27-amd64 =================================================================== --- trunk/memcheck/tests/malloc_free_fill.stderr.exp-glibc27-amd64 2008-06-26 08:58:25 UTC (rev 8284) +++ trunk/memcheck/tests/malloc_free_fill.stderr.exp-glibc27-amd64 2008-06-27 07:33:18 UTC (rev 8285) @@ -1,58 +0,0 @@ - -test simple malloc/free: -Use of uninitialised value of size 8 - at 0x........: (within /...libc...) - by 0x........: ... - by 0x........: ... - by 0x........: ... - by 0x........: ... - by 0x........: main (malloc_free_fill.c:17) - -Conditional jump or move depends on uninitialised value(s) - at 0x........: (within /...libc...) - by 0x........: ... - by 0x........: ... - by 0x........: ... - by 0x........: ... - by 0x........: main (malloc_free_fill.c:17) - -Conditional jump or move depends on uninitialised value(s) - at 0x........: vfprintf (in /...libc...) - by 0x........: ... - by 0x........: ... - by 0x........: ... - by 0x........: main (malloc_free_fill.c:17) -(should be malloc-filled) a[4] = 55555555 - -Invalid read of size 4 - at 0x........: main (malloc_free_fill.c:20) - Address 0x........ is 20 bytes inside a block of size 40 free'd - at 0x........: free (vg_replace_malloc.c:...) - by 0x........: main (malloc_free_fill.c:19) -(should be free-filled) a[5] = 77777777 -test realloc-larger: -(should be malloc-filled) r[25] = 55555555 - -Invalid read of size 4 - at 0x........: main (malloc_free_fill.c:33) - Address 0x........ is 104 bytes inside a block of size 120 free'd - at 0x........: realloc (vg_replace_malloc.c:...) - by 0x........: main (malloc_free_fill.c:31) -(should be free-filled) oldr[26] = 77777777 -(should be malloc-filled) r[35] = 55555555 -test realloc-smaller: -(should be malloc-filled) r[25] = 55555555 - -Invalid read of size 4 - at 0x........: main (malloc_free_fill.c:49) - Address 0x........ is not stack'd, malloc'd or (recently) free'd -(should be free-filled) oldr[26] = 77777777 -test calloc: -(should be zero) a[42] = 0 - -ERROR SUMMARY: 67 errors from 6 contexts (suppressed: 0 from 0) -malloc/free: in use at exit: 0 bytes in 0 blocks. -malloc/free: 6 allocs, 6 frees, 920 bytes allocated. -For a detailed leak analysis, rerun with: --leak-check=yes -For counts of detected errors, rerun with: -v -Use --track-origins=yes to see where uninitialised values come from Modified: trunk/memcheck/tests/malloc_free_fill.vgtest =================================================================== --- trunk/memcheck/tests/malloc_free_fill.vgtest 2008-06-26 08:58:25 UTC (rev 8284) +++ trunk/memcheck/tests/malloc_free_fill.vgtest 2008-06-27 07:33:18 UTC (rev 8285) @@ -1,2 +1,3 @@ prog: malloc_free_fill vgopts: --malloc-fill=0x55 --free-fill=0x77 +stderr_filter: filter_malloc_free_fill |