|
From: Carl E. L. <ce...@us...> - 2016-09-08 16:43:48
|
Valgrind Developers: The following patch was submitted to me by Will Schmidt to fix an issue with the massif/tests/mmapunmap test failure on ppc64. https://bugs.kde.org/show_bug.cgi?id=368461 I have tested the patch on PPC and it seems fine. Since this patch touches an arch independent file it needs to be reviewed and tested by the other platform developers. Please let us know if you find any issues with the patch. It is a small patch, I have attached it below for your convenience. Carl Love ----------------------------------------------------------------------- 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 --- massif/tests/Makefile.am | 3 ++- massif/tests/mmapunmap.post.exp-ppc64 | 1 + massif/tests/mmapunmap.vgtest | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 massif/tests/mmapunmap.post.exp-ppc64 diff --git a/massif/tests/Makefile.am b/massif/tests/Makefile.am index 4b69bfc..29cc9d3 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.post.exp-ppc64 b/massif/tests/mmapunmap.post.exp-ppc64 new file mode 100644 index 0000000..59550a3 --- /dev/null +++ b/massif/tests/mmapunmap.post.exp-ppc64 @@ -0,0 +1 @@ + n1: 81920000 0x........: generic_start_main.isra.0 (in /...libc...) diff --git a/massif/tests/mmapunmap.vgtest b/massif/tests/mmapunmap.vgtest index 503b750..40e5664 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 |