From: Carl Love Date: Tue, 13 Sep 2016 15:54:33 +0000 (+0000) Subject: Adapt massif mmapunmap test to handle ppc64 backtrace X-Git-Tag: svn/VALGRIND_3_12_0~73 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a1581f982dd915a39b1ba2f87a1ac322ef3b623;p=thirdparty%2Fvalgrind.git Adapt massif mmapunmap test to handle ppc64 backtrace The reported backtrace on ppc64 platform reports "generic_start_main.isra.0" in the backtrace, where other platforms typically see "main". Adjust the vgtest file to handle this variation. This is similar to existing changes as seen in deep-D.post.exp Bugzilla 368461 git-svn-id: svn://svn.valgrind.org/valgrind/trunk@15950 --- diff --git a/NEWS b/NEWS index 3f47411431..899050f260 100644 --- a/NEWS +++ b/NEWS @@ -154,6 +154,7 @@ where XXXXXX is the bug number as listed below. 363858 Valgrind does not support the IBM POWER ISA 3.0 instructions, part 4/5 364948 Valgrind does not support the IBM POWER ISA 3.0 instructions, part 5/5 366138 Fix configure errors out when using Xcode 8 (clang 8.0.0) +368461 mmapunmap test fails on ppc64 n-i-bz Fix incorrect (or infinite loop) unwind on RHEL7 x86 and amd64 n-i-bz massif --pages-as-heap=yes does not report peak caused by mmap+munmap @@ -164,7 +165,6 @@ n-i-bz Fix clobber list in none/tests/amd64/xacq_xrel.c [valgrind r15737] n-i-bz Bump allowed shift value for "add.w reg, sp, reg, lsl #N" [vex r3206] n-i-bz amd64: memcheck false positive with shr %edx - Release 3.11.0 (22 September 2015) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/massif/tests/Makefile.am b/massif/tests/Makefile.am index 4b69bfc7ed..29cc9d359a 100644 --- a/massif/tests/Makefile.am +++ b/massif/tests/Makefile.am @@ -24,7 +24,8 @@ EXTRA_DIST = \ long-names.post.exp long-names.stderr.exp long-names.vgtest \ long-time.post.exp long-time.stderr.exp long-time.vgtest \ malloc_usable.stderr.exp malloc_usable.vgtest \ - mmapunmap.post.exp mmapunmap.stderr.exp mmapunmap.vgtest \ + mmapunmap.post.exp mmapunmap.post.exp-ppc64 \ + mmapunmap.stderr.exp mmapunmap.vgtest \ new-cpp.post.exp new-cpp.stderr.exp new-cpp.vgtest \ no-stack-no-heap.post.exp no-stack-no-heap.stderr.exp no-stack-no-heap.vgtest \ null.post.exp null.stderr.exp null.vgtest \ diff --git a/massif/tests/mmapunmap.vgtest b/massif/tests/mmapunmap.vgtest index 503b750f92..40e5664e39 100644 --- a/massif/tests/mmapunmap.vgtest +++ b/massif/tests/mmapunmap.vgtest @@ -2,5 +2,5 @@ prog: mmapunmap vgopts: --pages-as-heap=yes --threshold=30.0 -q vgopts: --stacks=no --time-unit=B --depth=8 --massif-out-file=massif.out vgopts: --ignore-fn=__part_load_locale --ignore-fn=__time_load_locale --ignore-fn=dwarf2_unwind_dyld_add_image_hook --ignore-fn=get_or_create_key_element -post: grep -A4 -e =peak massif.out | grep -e 'main (mmapunmap.c:16)' | tr -s ' ' | ../../tests/filter_addresses +post: grep -A4 -e =peak massif.out | grep -e 'main (mmapunmap.c:16)\|generic_start_main.isra.0' | tr -s ' ' | ../../tests/filter_addresses | ../../tests/filter_libc cleanup: rm massif.out