Filter out some of Massif's verbose output that varies from machine to

machine, caused by them getting slightly different stack traces.

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

diff --git a/massif/ms_main.c b/massif/ms_main.c
index b83c900d632d22d51a4a250a90f4c37764155267..0f8aba81bf97e070d9eb1cc8a4359fe296cb50a7 100644 (file)
--- a/massif/ms_main.c
+++ b/massif/ms_main.c
@@ -2037,8 +2037,8 @@ static void ms_fini(Int exit_status)
    VERB(1, "top-XPts:             %u (%d%%)",
       alloc_xpt->n_children,
       ( n_xpts ? alloc_xpt->n_children * 100 / n_xpts : 0));
-   VERB(1, "XPt-init-expansions:  %u", n_xpt_init_expansions);
-   VERB(1, "XPt-later-expansions: %u", n_xpt_later_expansions);
+   VERB(1, "XPt init expansions:  %u", n_xpt_init_expansions);
+   VERB(1, "XPt later expansions: %u", n_xpt_later_expansions);
    VERB(1, "SXPt allocs:          %u", n_sxpt_allocs);
    VERB(1, "SXPt frees:           %u", n_sxpt_frees);
    VERB(1, "skipped snapshots:    %u", n_skipped_snapshots);
@@ -2046,7 +2046,7 @@ static void ms_fini(Int exit_status)
    VERB(1, "detailed snapshots:   %u", n_detailed_snapshots);
    VERB(1, "peak snapshots:       %u", n_peak_snapshots);
    VERB(1, "cullings:             %u", n_cullings);
-   VERB(1, "XCon_redos:           %u", n_XCon_redos);
+   VERB(1, "XCon redos:           %u", n_XCon_redos);
 }
 
 

diff --git a/massif/tests/culling1.stderr.exp b/massif/tests/culling1.stderr.exp
index 3661f26af08644c2a524c358ebedbb5f0139140e..6267be8df25f6bad4e3fe76f5f6989d9cd283f49 100644 (file)
--- a/massif/tests/culling1.stderr.exp
+++ b/massif/tests/culling1.stderr.exp
@@ -424,15 +424,15 @@ Massif: heap reallocs:        0
 Massif: heap frees:           0
 Massif: stack allocs:         0
 Massif: stack frees:          0
-Massif: XPts:                 4
-Massif: top-XPts:             1 (25%)
-Massif: XPt-init-expansions:  3
-Massif: XPt-later-expansions: 0
-Massif: SXPt allocs:          60
-Massif: SXPt frees:           36
+Massif: XPts:                 ...
+Massif: top-XPts:             ...
+Massif: XPt init expansions:  3
+Massif: XPt later expansions: 0
+Massif: SXPt allocs:          ...
+Massif: SXPt frees:           ...
 Massif: skipped snapshots:    51
 Massif: real snapshots:       150
 Massif: detailed snapshots:   15
 Massif: peak snapshots:       0
 Massif: cullings:             2
-Massif: XCon_redos:           0
+Massif: XCon redos:           ...

diff --git a/massif/tests/culling2.stderr.exp b/massif/tests/culling2.stderr.exp
index 454de24a1e6c12697eaab5301f5c1075e77b3915..47b74be568ccf3fc945ec3d53ab389a95dca07da 100644 (file)
--- a/massif/tests/culling2.stderr.exp
+++ b/massif/tests/culling2.stderr.exp
@@ -527,15 +527,15 @@ Massif: heap reallocs:        0
 Massif: heap frees:           0
 Massif: stack allocs:         0
 Massif: stack frees:          0
-Massif: XPts:                 4
-Massif: top-XPts:             1 (25%)
-Massif: XPt-init-expansions:  3
-Massif: XPt-later-expansions: 0
-Massif: SXPt allocs:          80
-Massif: SXPt frees:           76
+Massif: XPts:                 ...
+Massif: top-XPts:             ...
+Massif: XPt init expansions:  3
+Massif: XPt later expansions: 0
+Massif: SXPt allocs:          ...
+Massif: SXPt frees:           ...
 Massif: skipped snapshots:    1
 Massif: real snapshots:       200
 Massif: detailed snapshots:   20
 Massif: peak snapshots:       0
 Massif: cullings:             3
-Massif: XCon_redos:           0
+Massif: XCon redos:           ...

diff --git a/massif/tests/deep-B.stderr.exp b/massif/tests/deep-B.stderr.exp
index 8092076c8c3eef4993f24bfa2adf2aa4da520f97..16bd692db4ab0753ba6e3240bbe18b77a7c77d88 100644 (file)
--- a/massif/tests/deep-B.stderr.exp
+++ b/massif/tests/deep-B.stderr.exp
@@ -36,15 +36,15 @@ Massif: heap reallocs:        0
 Massif: heap frees:           0
 Massif: stack allocs:         0
 Massif: stack frees:          0
-Massif: XPts:                 9
-Massif: top-XPts:             1 (11%)
-Massif: XPt-init-expansions:  8
-Massif: XPt-later-expansions: 0
-Massif: SXPt allocs:          9
-Massif: SXPt frees:           0
+Massif: XPts:                 ...
+Massif: top-XPts:             ...
+Massif: XPt init expansions:  8
+Massif: XPt later expansions: 0
+Massif: SXPt allocs:          ...
+Massif: SXPt frees:           ...
 Massif: skipped snapshots:    0
 Massif: real snapshots:       11
 Massif: detailed snapshots:   1
 Massif: peak snapshots:       0
 Massif: cullings:             0
-Massif: XCon_redos:           10
+Massif: XCon redos:           ...

diff --git a/massif/tests/deep-C.stderr.exp b/massif/tests/deep-C.stderr.exp
index a7e36c7eb79d843cc72deee11fe8b2ece26d4e14..7c0cdc5d6da944d57211d4fc8f58664424deff1b 100644 (file)
--- a/massif/tests/deep-C.stderr.exp
+++ b/massif/tests/deep-C.stderr.exp
@@ -39,15 +39,15 @@ Massif: heap reallocs:        0
 Massif: heap frees:           0
 Massif: stack allocs:         0
 Massif: stack frees:          0
-Massif: XPts:                 6
-Massif: top-XPts:             1 (16%)
-Massif: XPt-init-expansions:  5
-Massif: XPt-later-expansions: 0
-Massif: SXPt allocs:          6
-Massif: SXPt frees:           0
+Massif: XPts:                 ...
+Massif: top-XPts:             ...
+Massif: XPt init expansions:  5
+Massif: XPt later expansions: 0
+Massif: SXPt allocs:          ...
+Massif: SXPt frees:           ...
 Massif: skipped snapshots:    0
 Massif: real snapshots:       11
 Massif: detailed snapshots:   1
 Massif: peak snapshots:       0
 Massif: cullings:             0
-Massif: XCon_redos:           10
+Massif: XCon redos:           ...

diff --git a/massif/tests/filter_verbose b/massif/tests/filter_verbose
index d14f3717541d938e030ed717b093de928d6141d1..eeaff695d2dee5f3ab9556583022df54a28d9f61 100755 (executable)
--- a/massif/tests/filter_verbose
+++ b/massif/tests/filter_verbose
@@ -9,4 +9,15 @@ $dir/filter_stderr |
 
 # Only print lines that contain "Massif:".  The -n means don't print any
 # lines by default, and the 'p' means do print those that match the pattern.
-sed -n "/Massif:/p"
+sed -n "/Massif:/p" |
+
+# These XPt counts vary from machine to machine, because the size of the
+# stack trace can vary -- eg. some machines have more stack frames below
+# zero than other machines.  So filter them out.
+sed "s/\(Massif: XPts:\).*/\1                 .../" |
+sed "s/\(Massif: top-XPts:\).*/\1             .../" |
+sed "s/\(Massif: XPt-init-expansions:\).*/\1  .../" |
+sed "s/\(Massif: XPt-later-expansions:\).*/\1 .../" |
+sed "s/\(Massif: SXPt allocs:\).*/\1          .../" |
+sed "s/\(Massif: SXPt frees:\).*/\1           .../" |
+sed "s/\(Massif: XCon redos:\).*/\1           .../"

diff --git a/massif/tests/peak2.stderr.exp b/massif/tests/peak2.stderr.exp
index 49e536b5e4afb7882bdf5043f186b18c7c955f46..a30e60f3555013d620c9e88419e73673abb80cb0 100644 (file)
--- a/massif/tests/peak2.stderr.exp
+++ b/massif/tests/peak2.stderr.exp
@@ -94,15 +94,15 @@ Massif: heap reallocs:        0
 Massif: heap frees:           20
 Massif: stack allocs:         0
 Massif: stack frees:          0
-Massif: XPts:                 7
-Massif: top-XPts:             2 (28%)
-Massif: XPt-init-expansions:  5
-Massif: XPt-later-expansions: 0
-Massif: SXPt allocs:          75
-Massif: SXPt frees:           0
+Massif: XPts:                 ...
+Massif: top-XPts:             ...
+Massif: XPt init expansions:  5
+Massif: XPt later expansions: 0
+Massif: SXPt allocs:          ...
+Massif: SXPt frees:           ...
 Massif: skipped snapshots:    0
 Massif: real snapshots:       76
 Massif: detailed snapshots:   15
 Massif: peak snapshots:       15
 Massif: cullings:             0
-Massif: XCon_redos:           0
+Massif: XCon redos:           ...

diff --git a/massif/tests/realloc.stderr.exp b/massif/tests/realloc.stderr.exp
index ad596ec9dbdd2e4d22b2df0a1c678e8c33aa8f00..eff35af04a9ce98aaec971baab0414ce47cb9913 100644 (file)
--- a/massif/tests/realloc.stderr.exp
+++ b/massif/tests/realloc.stderr.exp
@@ -26,15 +26,15 @@ Massif: heap reallocs:        3
 Massif: heap frees:           1
 Massif: stack allocs:         0
 Massif: stack frees:          0
-Massif: XPts:                 13
-Massif: top-XPts:             4 (30%)
-Massif: XPt-init-expansions:  9
-Massif: XPt-later-expansions: 0
-Massif: SXPt allocs:          20
-Massif: SXPt frees:           0
+Massif: XPts:                 ...
+Massif: top-XPts:             ...
+Massif: XPt init expansions:  9
+Massif: XPt later expansions: 0
+Massif: SXPt allocs:          ...
+Massif: SXPt frees:           ...
 Massif: skipped snapshots:    0
 Massif: real snapshots:       8
 Massif: detailed snapshots:   2
 Massif: peak snapshots:       2
 Massif: cullings:             0
-Massif: XCon_redos:           0
+Massif: XCon redos:           ...