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 20457ecc5fe05613761837466947238b20fd18a4..1fe91e60ce9b93e40cfc11bd5516df765b333eff 100644 (file)
--- 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 df2d3aa1029bebdc2172b69d5ab06e195231252c..09dba32977b24051ca8316e94b7a814c26ea02ba 100644 (file)
--- 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 0d603aea2413515b0d8ce701a6ed24ce9b7f5888..2a53b90b706b37d3342fc7b7d412b0b0c16dbab0 100644 (file)
--- 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 b35673b903203f9471d0b0d1343d1d28f1f906ea..2ffb3eceb4c316fcf0d11362207adf803ef350b3 100644 (file)
--- 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