massif regtest: make verbose tests work on both 32bit and 64bit

Now alloc fns only have the appropriate new overloads which
means 32bit has unsigned size but 64bit has unsigned long.
Filter the unsigned long to unsigned.

diff --git a/massif/tests/culling1.stderr.exp b/massif/tests/culling1.stderr.exp
index 6e3820a664987cc72c02c82bf72e73f69c76a774..ffc88d6336bf6e8d5da3853137d996fa8a33c20b 100644 (file)
--- a/massif/tests/culling1.stderr.exp
+++ b/massif/tests/culling1.stderr.exp
@@ -1,21 +1,21 @@
 Massif: alloc-fns:
 Massif:   malloc
 Massif:   __builtin_new
-Massif:   operator new(unsigned long)
+Massif:   operator new(unsigned)
 Massif:   __builtin_vec_new
-Massif:   operator new[](unsigned long)
+Massif:   operator new[](unsigned)
 Massif:   calloc
 Massif:   aligned_alloc
 Massif:   realloc
 Massif:   memalign
 Massif:   posix_memalign
 Massif:   valloc
-Massif:   operator new(unsigned long, std::nothrow_t const&)
-Massif:   operator new[](unsigned long, std::nothrow_t const&)
-Massif:   operator new(unsigned long, std::align_val_t)
-Massif:   operator new[](unsigned long, std::align_val_t)
-Massif:   operator new(unsigned long, std::align_val_t, std::nothrow_t const&)
-Massif:   operator new[](unsigned long, std::align_val_t, std::nothrow_t const&)
+Massif:   operator new(unsigned, std::nothrow_t const&)
+Massif:   operator new[](unsigned, std::nothrow_t const&)
+Massif:   operator new(unsigned, std::align_val_t)
+Massif:   operator new[](unsigned, std::align_val_t)
+Massif:   operator new(unsigned, std::align_val_t, std::nothrow_t const&)
+Massif:   operator new[](unsigned, std::align_val_t, std::nothrow_t const&)
 Massif: ignore-fns:
 Massif:   0: __part_load_locale
 Massif:   1: __time_load_locale

diff --git a/massif/tests/culling2.stderr.exp b/massif/tests/culling2.stderr.exp
index 13f476477bff857793cd9f640f25e3253608bf21..1d8682fbec253fba83fd8c5d7ecf9147485971c4 100644 (file)
--- a/massif/tests/culling2.stderr.exp
+++ b/massif/tests/culling2.stderr.exp
@@ -1,21 +1,21 @@
 Massif: alloc-fns:
 Massif:   malloc
 Massif:   __builtin_new
-Massif:   operator new(unsigned long)
+Massif:   operator new(unsigned)
 Massif:   __builtin_vec_new
-Massif:   operator new[](unsigned long)
+Massif:   operator new[](unsigned)
 Massif:   calloc
 Massif:   aligned_alloc
 Massif:   realloc
 Massif:   memalign
 Massif:   posix_memalign
 Massif:   valloc
-Massif:   operator new(unsigned long, std::nothrow_t const&)
-Massif:   operator new[](unsigned long, std::nothrow_t const&)
-Massif:   operator new(unsigned long, std::align_val_t)
-Massif:   operator new[](unsigned long, std::align_val_t)
-Massif:   operator new(unsigned long, std::align_val_t, std::nothrow_t const&)
-Massif:   operator new[](unsigned long, std::align_val_t, std::nothrow_t const&)
+Massif:   operator new(unsigned, std::nothrow_t const&)
+Massif:   operator new[](unsigned, std::nothrow_t const&)
+Massif:   operator new(unsigned, std::align_val_t)
+Massif:   operator new[](unsigned, std::align_val_t)
+Massif:   operator new(unsigned, std::align_val_t, std::nothrow_t const&)
+Massif:   operator new[](unsigned, std::align_val_t, std::nothrow_t const&)
 Massif: ignore-fns:
 Massif:   0: __part_load_locale
 Massif:   1: __time_load_locale

diff --git a/massif/tests/deep-B.stderr.exp b/massif/tests/deep-B.stderr.exp
index 6186969b373a2702b52241d194196f0990dbb934..e1f714d9f1352c17410b46803d0182f3391966a1 100644 (file)
--- a/massif/tests/deep-B.stderr.exp
+++ b/massif/tests/deep-B.stderr.exp
@@ -1,21 +1,21 @@
 Massif: alloc-fns:
 Massif:   malloc
 Massif:   __builtin_new
-Massif:   operator new(unsigned long)
+Massif:   operator new(unsigned)
 Massif:   __builtin_vec_new
-Massif:   operator new[](unsigned long)
+Massif:   operator new[](unsigned)
 Massif:   calloc
 Massif:   aligned_alloc
 Massif:   realloc
 Massif:   memalign
 Massif:   posix_memalign
 Massif:   valloc
-Massif:   operator new(unsigned long, std::nothrow_t const&)
-Massif:   operator new[](unsigned long, std::nothrow_t const&)
-Massif:   operator new(unsigned long, std::align_val_t)
-Massif:   operator new[](unsigned long, std::align_val_t)
-Massif:   operator new(unsigned long, std::align_val_t, std::nothrow_t const&)
-Massif:   operator new[](unsigned long, std::align_val_t, std::nothrow_t const&)
+Massif:   operator new(unsigned, std::nothrow_t const&)
+Massif:   operator new[](unsigned, std::nothrow_t const&)
+Massif:   operator new(unsigned, std::align_val_t)
+Massif:   operator new[](unsigned, std::align_val_t)
+Massif:   operator new(unsigned, std::align_val_t, std::nothrow_t const&)
+Massif:   operator new[](unsigned, std::align_val_t, std::nothrow_t const&)
 Massif:   a6
 Massif:   a7
 Massif:   a8

diff --git a/massif/tests/deep-C.stderr.exp b/massif/tests/deep-C.stderr.exp
index 326f4c7f1aa87523ffa35e2abb8c7b290a1a7d09..34d65d5ad40148b733f596c586a441d0c8c9f494 100644 (file)
--- a/massif/tests/deep-C.stderr.exp
+++ b/massif/tests/deep-C.stderr.exp
@@ -1,21 +1,21 @@
 Massif: alloc-fns:
 Massif:   malloc
 Massif:   __builtin_new
-Massif:   operator new(unsigned long)
+Massif:   operator new(unsigned)
 Massif:   __builtin_vec_new
-Massif:   operator new[](unsigned long)
+Massif:   operator new[](unsigned)
 Massif:   calloc
 Massif:   aligned_alloc
 Massif:   realloc
 Massif:   memalign
 Massif:   posix_memalign
 Massif:   valloc
-Massif:   operator new(unsigned long, std::nothrow_t const&)
-Massif:   operator new[](unsigned long, std::nothrow_t const&)
-Massif:   operator new(unsigned long, std::align_val_t)
-Massif:   operator new[](unsigned long, std::align_val_t)
-Massif:   operator new(unsigned long, std::align_val_t, std::nothrow_t const&)
-Massif:   operator new[](unsigned long, std::align_val_t, std::nothrow_t const&)
+Massif:   operator new(unsigned, std::nothrow_t const&)
+Massif:   operator new[](unsigned, std::nothrow_t const&)
+Massif:   operator new(unsigned, std::align_val_t)
+Massif:   operator new[](unsigned, std::align_val_t)
+Massif:   operator new(unsigned, std::align_val_t, std::nothrow_t const&)
+Massif:   operator new[](unsigned, std::align_val_t, std::nothrow_t const&)
 Massif:   a3
 Massif:   a4
 Massif:   a5

diff --git a/massif/tests/filter_verbose b/massif/tests/filter_verbose
index 745b521ea678887e48a8938bf9b189e912e8c30e..d992e653f51c8717047495a5f208daf28fd192cd 100755 (executable)
--- a/massif/tests/filter_verbose
+++ b/massif/tests/filter_verbose
@@ -28,4 +28,8 @@ 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           .../"
+sed "s/\(Massif: XCon redos:\).*/\1           .../" |
+sed "s/Massif:   operator new(unsigned long/Massif:   operator new(unsigned/" |
+sed "s/Massif:   operator new\[\](unsigned long/Massif:   operator new\[\](unsigned/"
+
+

diff --git a/massif/tests/peak2.stderr.exp b/massif/tests/peak2.stderr.exp
index 2e14091303ab5a19b79309c8325f98fc571c7dda..fc93effbbd1a2d521353fe9003fde30d0731cf9c 100644 (file)
--- a/massif/tests/peak2.stderr.exp
+++ b/massif/tests/peak2.stderr.exp
@@ -1,21 +1,21 @@
 Massif: alloc-fns:
 Massif:   malloc
 Massif:   __builtin_new
-Massif:   operator new(unsigned long)
+Massif:   operator new(unsigned)
 Massif:   __builtin_vec_new
-Massif:   operator new[](unsigned long)
+Massif:   operator new[](unsigned)
 Massif:   calloc
 Massif:   aligned_alloc
 Massif:   realloc
 Massif:   memalign
 Massif:   posix_memalign
 Massif:   valloc
-Massif:   operator new(unsigned long, std::nothrow_t const&)
-Massif:   operator new[](unsigned long, std::nothrow_t const&)
-Massif:   operator new(unsigned long, std::align_val_t)
-Massif:   operator new[](unsigned long, std::align_val_t)
-Massif:   operator new(unsigned long, std::align_val_t, std::nothrow_t const&)
-Massif:   operator new[](unsigned long, std::align_val_t, std::nothrow_t const&)
+Massif:   operator new(unsigned, std::nothrow_t const&)
+Massif:   operator new[](unsigned, std::nothrow_t const&)
+Massif:   operator new(unsigned, std::align_val_t)
+Massif:   operator new[](unsigned, std::align_val_t)
+Massif:   operator new(unsigned, std::align_val_t, std::nothrow_t const&)
+Massif:   operator new[](unsigned, std::align_val_t, std::nothrow_t const&)
 Massif: ignore-fns:
 Massif:   0: __part_load_locale
 Massif:   1: __time_load_locale

diff --git a/massif/tests/realloc.stderr.exp b/massif/tests/realloc.stderr.exp
index 780d0826bb16806e8c87ad44b02d261c4daa7a53..cb4a016a30408e0a26e0ffdb86c55eea1da7575b 100644 (file)
--- a/massif/tests/realloc.stderr.exp
+++ b/massif/tests/realloc.stderr.exp
@@ -1,21 +1,21 @@
 Massif: alloc-fns:
 Massif:   malloc
 Massif:   __builtin_new
-Massif:   operator new(unsigned long)
+Massif:   operator new(unsigned)
 Massif:   __builtin_vec_new
-Massif:   operator new[](unsigned long)
+Massif:   operator new[](unsigned)
 Massif:   calloc
 Massif:   aligned_alloc
 Massif:   realloc
 Massif:   memalign
 Massif:   posix_memalign
 Massif:   valloc
-Massif:   operator new(unsigned long, std::nothrow_t const&)
-Massif:   operator new[](unsigned long, std::nothrow_t const&)
-Massif:   operator new(unsigned long, std::align_val_t)
-Massif:   operator new[](unsigned long, std::align_val_t)
-Massif:   operator new(unsigned long, std::align_val_t, std::nothrow_t const&)
-Massif:   operator new[](unsigned long, std::align_val_t, std::nothrow_t const&)
+Massif:   operator new(unsigned, std::nothrow_t const&)
+Massif:   operator new[](unsigned, std::nothrow_t const&)
+Massif:   operator new(unsigned, std::align_val_t)
+Massif:   operator new[](unsigned, std::align_val_t)
+Massif:   operator new(unsigned, std::align_val_t, std::nothrow_t const&)
+Massif:   operator new[](unsigned, std::align_val_t, std::nothrow_t const&)
 Massif: ignore-fns:
 Massif:   0: __part_load_locale
 Massif:   1: __time_load_locale