Patch 1 in a revised series of cleanup patches from Will Schmidt

Update the massif/big-alloc test for ppc64*.
In comparison to the existing .exp files, the time,total,extra-heap
values generated on ppc64* vary from the other architectures.

This .exp allows the ppc64 targets to pass the test.

This patch fixes Vagrind bugzilla 347322.

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

diff --git a/massif/tests/Makefile.am b/massif/tests/Makefile.am
index 5017543398b1966c461639ff6ae3ccf2f71f2c73..50fcf6caae6bce87d2805842f092fe9104cbd919 100644 (file)
--- a/massif/tests/Makefile.am
+++ b/massif/tests/Makefile.am
@@ -8,7 +8,7 @@ EXTRA_DIST = \
        alloc-fns-B.post.exp alloc-fns-B.stderr.exp alloc-fns-B.vgtest \
        basic.post.exp basic.stderr.exp basic.vgtest \
        basic2.post.exp basic2.stderr.exp basic2.vgtest \
-       big-alloc.post.exp big-alloc.post.exp-64bit \
+       big-alloc.post.exp big-alloc.post.exp-64bit big-alloc.post.exp-ppc64 \
        big-alloc.stderr.exp big-alloc.vgtest \
        deep-A.post.exp deep-A.stderr.exp deep-A.vgtest \
        deep-B.post.exp deep-B.stderr.exp deep-B.vgtest \

diff --git a/massif/tests/big-alloc.post.exp-ppc64 b/massif/tests/big-alloc.post.exp-ppc64
new file mode 100644 (file)
index 0000000..1d2c906
--- /dev/null
+++ b/massif/tests/big-alloc.post.exp-ppc64
@@ -0,0 +1,54 @@
+--------------------------------------------------------------------------------
+Command:            ./big-alloc
+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
+ms_print arguments: massif.out
+--------------------------------------------------------------------------------
+
+
+    MB
+100.6^                                                                       :
+     |                                                                       :
+     |                                                                @@@@@@@:
+     |                                                                @      :
+     |                                                         :::::::@      :
+     |                                                         :      @      :
+     |                                                  ::::::::      @      :
+     |                                                  :      :      @      :
+     |                                           ::::::::      :      @      :
+     |                                           :      :      :      @      :
+     |                                    ::::::::      :      :      @      :
+     |                                    :      :      :      :      @      :
+     |                            :::::::::      :      :      :      @      :
+     |                            :       :      :      :      :      @      :
+     |                     ::::::::       :      :      :      :      @      :
+     |                     :      :       :      :      :      :      @      :
+     |              ::::::::      :       :      :      :      :      @      :
+     |              :      :      :       :      :      :      :      @      :
+     |       ::::::::      :      :       :      :      :      :      @      :
+     |       :      :      :      :       :      :      :      :      @      :
+   0 +----------------------------------------------------------------------->MB
+     0                                                                   100.6
+
+Number of snapshots: 11
+ Detailed snapshots: [9]
+
+--------------------------------------------------------------------------------
+  n        time(B)         total(B)   useful-heap(B) extra-heap(B)    stacks(B)
+--------------------------------------------------------------------------------
+  0              0                0                0             0            0
+  1     10,551,240       10,551,240       10,485,760        65,480            0
+  2     21,102,480       21,102,480       20,971,520       130,960            0
+  3     31,653,720       31,653,720       31,457,280       196,440            0
+  4     42,204,960       42,204,960       41,943,040       261,920            0
+  5     52,756,200       52,756,200       52,428,800       327,400            0
+  6     63,307,440       63,307,440       62,914,560       392,880            0
+  7     73,858,680       73,858,680       73,400,320       458,360            0
+  8     84,409,920       84,409,920       83,886,080       523,840            0
+  9     94,961,160       94,961,160       94,371,840       589,320            0
+99.38% (94,371,840B) (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+->99.38% (94,371,840B) 0x........: main (big-alloc.c:12)
+  
+--------------------------------------------------------------------------------
+  n        time(B)         total(B)   useful-heap(B) extra-heap(B)    stacks(B)
+--------------------------------------------------------------------------------
+ 10    105,512,400      105,512,400      104,857,600       654,800            0