From: Ivo Raisr <ivosh@ivosh.net>
Date: Mon, 4 Apr 2016 02:25:40 +0000 (+0000)
Subject: Fix expected output of massif/tests/{new-cpp,overloaded-new}
X-Git-Tag: svn/VALGRIND_3_12_0~176
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af74da9d2bfa2190c2665f539a2a9a2c732d4431;p=thirdparty%2Fvalgrind.git

Fix expected output of massif/tests/{new-cpp,overloaded-new}
for libstdc++ from gcc5.
Even with fix for bug 345307 we still see allocations for
the emergency pool in libstdc++ which skew the expected results.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@15847
---

diff --git a/massif/tests/new-cpp.post.exp b/massif/tests/new-cpp.post.exp
index 20457ecc5f..1fe91e60ce 100644
--- a/massif/tests/new-cpp.post.exp
+++ b/massif/tests/new-cpp.post.exp
@@ -1,6 +1,6 @@
 --------------------------------------------------------------------------------
 Command:            ./new-cpp
-Massif arguments:   --stacks=no --time-unit=B --massif-out-file=massif.out --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
+Massif arguments:   --stacks=no --time-unit=B --massif-out-file=massif.out --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 --ignore-fn=_GLOBAL__sub_I_eh_alloc.cc
 ms_print arguments: massif.out
 --------------------------------------------------------------------------------
 
diff --git a/massif/tests/new-cpp.vgtest b/massif/tests/new-cpp.vgtest
index df2d3aa102..09dba32977 100644
--- a/massif/tests/new-cpp.vgtest
+++ b/massif/tests/new-cpp.vgtest
@@ -1,5 +1,6 @@
 prog: new-cpp
 vgopts: --stacks=no --time-unit=B --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
+vgopts: --ignore-fn=__part_load_locale --ignore-fn=__time_load_locale --ignore-fn=dwarf2_unwind_dyld_add_image_hook
+vgopts: --ignore-fn=get_or_create_key_element --ignore-fn=_GLOBAL__sub_I_eh_alloc.cc
 post: perl ../../massif/ms_print massif.out | ../../tests/filter_addresses
 cleanup: rm massif.out
diff --git a/massif/tests/overloaded-new.post.exp b/massif/tests/overloaded-new.post.exp
index 0d603aea24..2a53b90b70 100644
--- a/massif/tests/overloaded-new.post.exp
+++ b/massif/tests/overloaded-new.post.exp
@@ -1,6 +1,6 @@
 --------------------------------------------------------------------------------
 Command:            ./overloaded-new
-Massif arguments:   --stacks=no --time-unit=B --massif-out-file=massif.out --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
+Massif arguments:   --stacks=no --time-unit=B --massif-out-file=massif.out --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 --ignore-fn=_GLOBAL__sub_I_eh_alloc.cc
 ms_print arguments: massif.out
 --------------------------------------------------------------------------------
 
diff --git a/massif/tests/overloaded-new.vgtest b/massif/tests/overloaded-new.vgtest
index b35673b903..2ffb3eceb4 100644
--- a/massif/tests/overloaded-new.vgtest
+++ b/massif/tests/overloaded-new.vgtest
@@ -1,5 +1,6 @@
 prog: overloaded-new
 vgopts: --stacks=no --time-unit=B --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
+vgopts: --ignore-fn=__part_load_locale --ignore-fn=__time_load_locale --ignore-fn=dwarf2_unwind_dyld_add_image_hook
+vgopts: --ignore-fn=get_or_create_key_element --ignore-fn=_GLOBAL__sub_I_eh_alloc.cc
 post: perl ../../massif/ms_print massif.out | ../../tests/filter_addresses
 cleanup: rm massif.out