From: Bart Van Assche Date: Fri, 27 Jun 2008 07:33:18 +0000 (+0000) Subject: Added extra filtering for the stderr output of malloc_free_fill such that the output... X-Git-Tag: svn/VALGRIND_3_4_0~429 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c5e7c66707784c4a763a8a3840ee4f1265f5cd2;p=thirdparty%2Fvalgrind.git 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. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@8285 --- diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am index 737a439ccf..90229131ee 100644 --- a/memcheck/tests/Makefile.am +++ b/memcheck/tests/Makefile.am @@ -75,8 +75,7 @@ EXTRA_DIST = $(noinst_SCRIPTS) \ 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 \ diff --git a/memcheck/tests/filter_malloc_free_fill b/memcheck/tests/filter_malloc_free_fill new file mode 100755 index 0000000000..9eecf58dd3 --- /dev/null +++ b/memcheck/tests/filter_malloc_free_fill @@ -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' diff --git a/memcheck/tests/malloc_free_fill.stderr.exp-glibc27-amd64 b/memcheck/tests/malloc_free_fill.stderr.exp similarity index 98% rename from memcheck/tests/malloc_free_fill.stderr.exp-glibc27-amd64 rename to memcheck/tests/malloc_free_fill.stderr.exp index 3aaeebde72..5f6f019411 100644 --- a/memcheck/tests/malloc_free_fill.stderr.exp-glibc27-amd64 +++ b/memcheck/tests/malloc_free_fill.stderr.exp @@ -1,6 +1,6 @@ test simple malloc/free: -Use of uninitialised value of size 8 +Use of uninitialised value of size . at 0x........: (within /...libc...) by 0x........: ... by 0x........: ... diff --git a/memcheck/tests/malloc_free_fill.stderr.exp-glibc25-amd64 b/memcheck/tests/malloc_free_fill.stderr.exp-glibc25-amd64 deleted file mode 100644 index 271ec0bf31..0000000000 --- a/memcheck/tests/malloc_free_fill.stderr.exp-glibc25-amd64 +++ /dev/null @@ -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 diff --git a/memcheck/tests/malloc_free_fill.stderr.exp-glibc25-x86 b/memcheck/tests/malloc_free_fill.stderr.exp-glibc25-x86 deleted file mode 100644 index 8aabc5cc0d..0000000000 --- a/memcheck/tests/malloc_free_fill.stderr.exp-glibc25-x86 +++ /dev/null @@ -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 diff --git a/memcheck/tests/malloc_free_fill.vgtest b/memcheck/tests/malloc_free_fill.vgtest index ba14381853..5ae6ffb818 100644 --- a/memcheck/tests/malloc_free_fill.vgtest +++ b/memcheck/tests/malloc_free_fill.vgtest @@ -1,2 +1,3 @@ prog: malloc_free_fill vgopts: --malloc-fill=0x55 --free-fill=0x77 +stderr_filter: filter_malloc_free_fill