Another attempt at fixing some Massif regtest failures.

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

diff --git a/massif/tests/culling1.stderr.exp b/massif/tests/culling1.stderr.exp
index 6267be8df25f6bad4e3fe76f5f6989d9cd283f49..564db903f93244209316349ee3c54bb0b115b5b8 100644 (file)
--- a/massif/tests/culling1.stderr.exp
+++ b/massif/tests/culling1.stderr.exp
@@ -426,8 +426,8 @@ Massif: stack allocs:         0
 Massif: stack frees:          0
 Massif: XPts:                 ...
 Massif: top-XPts:             ...
-Massif: XPt init expansions:  3
-Massif: XPt later expansions: 0
+Massif: XPt init expansions:  ...
+Massif: XPt later expansions: ...
 Massif: SXPt allocs:          ...
 Massif: SXPt frees:           ...
 Massif: skipped snapshots:    51

diff --git a/massif/tests/culling2.stderr.exp b/massif/tests/culling2.stderr.exp
index 47b74be568ccf3fc945ec3d53ab389a95dca07da..ab8303b64d9c3d3b2fc29bebe1025f424525909a 100644 (file)
--- a/massif/tests/culling2.stderr.exp
+++ b/massif/tests/culling2.stderr.exp
@@ -529,8 +529,8 @@ Massif: stack allocs:         0
 Massif: stack frees:          0
 Massif: XPts:                 ...
 Massif: top-XPts:             ...
-Massif: XPt init expansions:  3
-Massif: XPt later expansions: 0
+Massif: XPt init expansions:  ...
+Massif: XPt later expansions: ...
 Massif: SXPt allocs:          ...
 Massif: SXPt frees:           ...
 Massif: skipped snapshots:    1

diff --git a/massif/tests/deep-B.stderr.exp b/massif/tests/deep-B.stderr.exp
index 16bd692db4ab0753ba6e3240bbe18b77a7c77d88..32c05be1ca0357787e5036135887bb94856e57aa 100644 (file)
--- a/massif/tests/deep-B.stderr.exp
+++ b/massif/tests/deep-B.stderr.exp
@@ -38,8 +38,8 @@ Massif: stack allocs:         0
 Massif: stack frees:          0
 Massif: XPts:                 ...
 Massif: top-XPts:             ...
-Massif: XPt init expansions:  8
-Massif: XPt later expansions: 0
+Massif: XPt init expansions:  ...
+Massif: XPt later expansions: ...
 Massif: SXPt allocs:          ...
 Massif: SXPt frees:           ...
 Massif: skipped snapshots:    0

diff --git a/massif/tests/deep-C.stderr.exp b/massif/tests/deep-C.stderr.exp
index 7c0cdc5d6da944d57211d4fc8f58664424deff1b..fb11c9f59ec975f7f3676c6da4f91f04cd4c1e50 100644 (file)
--- a/massif/tests/deep-C.stderr.exp
+++ b/massif/tests/deep-C.stderr.exp
@@ -41,8 +41,8 @@ Massif: stack allocs:         0
 Massif: stack frees:          0
 Massif: XPts:                 ...
 Massif: top-XPts:             ...
-Massif: XPt init expansions:  5
-Massif: XPt later expansions: 0
+Massif: XPt init expansions:  ...
+Massif: XPt later expansions: ...
 Massif: SXPt allocs:          ...
 Massif: SXPt frees:           ...
 Massif: skipped snapshots:    0

diff --git a/massif/tests/peak2.stderr.exp b/massif/tests/peak2.stderr.exp
index a30e60f3555013d620c9e88419e73673abb80cb0..71f5dba399b8db8d6bf795602d7bf2fe051eb4f0 100644 (file)
--- a/massif/tests/peak2.stderr.exp
+++ b/massif/tests/peak2.stderr.exp
@@ -96,8 +96,8 @@ Massif: stack allocs:         0
 Massif: stack frees:          0
 Massif: XPts:                 ...
 Massif: top-XPts:             ...
-Massif: XPt init expansions:  5
-Massif: XPt later expansions: 0
+Massif: XPt init expansions:  ...
+Massif: XPt later expansions: ...
 Massif: SXPt allocs:          ...
 Massif: SXPt frees:           ...
 Massif: skipped snapshots:    0

diff --git a/massif/tests/realloc.stderr.exp b/massif/tests/realloc.stderr.exp
index eff35af04a9ce98aaec971baab0414ce47cb9913..db9f20a12eb481b60d39b625621bbd9e27ef0fec 100644 (file)
--- a/massif/tests/realloc.stderr.exp
+++ b/massif/tests/realloc.stderr.exp
@@ -28,8 +28,8 @@ Massif: stack allocs:         0
 Massif: stack frees:          0
 Massif: XPts:                 ...
 Massif: top-XPts:             ...
-Massif: XPt init expansions:  9
-Massif: XPt later expansions: 0
+Massif: XPt init expansions:  ...
+Massif: XPt later expansions: ...
 Massif: SXPt allocs:          ...
 Massif: SXPt frees:           ...
 Massif: skipped snapshots:    0