Darwin regtest: various filters

Use -q to hide Darwin leaks in HEAP SUMMARY
The pcmpgt test uses uint64_t whish is unsigned long long on Darwin
but unsigned long on all other amd64 OSes
Swap malloc_zone_memalign with posix_memalign

diff --git a/memcheck/tests/amd64/Makefile.am b/memcheck/tests/amd64/Makefile.am
index 98f3f78fa1bbba4c0c828b03dbc7b6877038dea5..4b25e1dcfc7d22573521b76cde6f1973be760a85 100644 (file)
--- a/memcheck/tests/amd64/Makefile.am
+++ b/memcheck/tests/amd64/Makefile.am
@@ -1,7 +1,7 @@
 
 include $(top_srcdir)/Makefile.tool-tests.am
 
-dist_noinst_SCRIPTS = filter_stderr
+dist_noinst_SCRIPTS = filter_stderr filter_malloc_zone filter_pcmpgt
 
 INSN_TESTS = insn_basic insn_mmx insn_sse insn_sse2 insn_fpu
 

diff --git a/memcheck/tests/amd64/bug492210_1.vgtest b/memcheck/tests/amd64/bug492210_1.vgtest
index e80be84ec86e065b44d848a6747852442d33be6f..9a50eaf72a1b107be12a4d234a000935b098945b 100644 (file)
--- a/memcheck/tests/amd64/bug492210_1.vgtest
+++ b/memcheck/tests/amd64/bug492210_1.vgtest
@@ -1,3 +1,4 @@
+prereq: test -e bug492210
 prog: bug492210
 vgopts: -q
 

diff --git a/memcheck/tests/amd64/bug492210_2.vgtest b/memcheck/tests/amd64/bug492210_2.vgtest
index 1c4e3614f8789b6f1f0b70ff6cbd6742a4c83501..159e836bf294cf1c5c4257daa052ee930307864a 100644 (file)
--- a/memcheck/tests/amd64/bug492210_2.vgtest
+++ b/memcheck/tests/amd64/bug492210_2.vgtest
@@ -1,3 +1,4 @@
+prereq: test -e bug492210
 prog: bug492210
 vgopts: -q --expensive-definedness-checks=yes
 

diff --git a/memcheck/tests/amd64/filter_malloc_zone b/memcheck/tests/amd64/filter_malloc_zone
new file mode 100755 (executable)
index 0000000..442d2c4
--- /dev/null
+++ b/memcheck/tests/amd64/filter_malloc_zone
@@ -0,0 +1,4 @@
+#! /bin/sh
+
+./filter_stderr "$@" |
+sed 's/malloc_zone_memalign/posix_memalign/'

diff --git a/memcheck/tests/amd64/filter_pcmpgt b/memcheck/tests/amd64/filter_pcmpgt
new file mode 100755 (executable)
index 0000000..8243e1b
--- /dev/null
+++ b/memcheck/tests/amd64/filter_pcmpgt
@@ -0,0 +1,7 @@
+#! /bin/sh
+
+../filter_allocs "$@" |
+
+# on Darwin "uint64_t" becomes unsigned long long
+# on other platforms it is unsigned long
+sed 's/unsigned long long/unsigned long/'

diff --git a/memcheck/tests/amd64/pcmpgt.vgtest b/memcheck/tests/amd64/pcmpgt.vgtest
index 15e0d76051dd12a30ece6674720ed93a92558be2..6b7deafe62737e83887fb5d09d398738ead399ba 100644 (file)
--- a/memcheck/tests/amd64/pcmpgt.vgtest
+++ b/memcheck/tests/amd64/pcmpgt.vgtest
@@ -1,3 +1,3 @@
 prog: pcmpgt amd64
 prereq: test -e pcmpgt
-stderr_filter: ../filter_allocs
+stderr_filter: filter_pcmpgt

diff --git a/memcheck/tests/amd64/sh-mem-vec128-plo-no.vgtest b/memcheck/tests/amd64/sh-mem-vec128-plo-no.vgtest
index 160b95b28b3a4af17b1121c8d9c04c3a802c7d50..e167b251bb0eab923701ed47cde63f9bcf56de17 100644 (file)
--- a/memcheck/tests/amd64/sh-mem-vec128-plo-no.vgtest
+++ b/memcheck/tests/amd64/sh-mem-vec128-plo-no.vgtest
@@ -1,3 +1,4 @@
 prog: sh-mem-vec128
 args: -q
-vgopts: --partial-loads-ok=no
+vgopts: --partial-loads-ok=no -q
+stderr_filter: filter_malloc_zone

diff --git a/memcheck/tests/amd64/sh-mem-vec128-plo-yes.vgtest b/memcheck/tests/amd64/sh-mem-vec128-plo-yes.vgtest
index 76585dd373f00c6c7d914cc2836be1966305f562..c4216eb2cf0f82dcf5f9fcfd7d4a4a666b92a463 100644 (file)
--- a/memcheck/tests/amd64/sh-mem-vec128-plo-yes.vgtest
+++ b/memcheck/tests/amd64/sh-mem-vec128-plo-yes.vgtest
@@ -1,3 +1,4 @@
 prog: sh-mem-vec128
 args: -q
-vgopts: --partial-loads-ok=yes
+vgopts: --partial-loads-ok=yes -q
+stderr_filter: filter_malloc_zone

diff --git a/memcheck/tests/common/sh-mem-vec128-plo-no.stderr.exp-64bit-le b/memcheck/tests/common/sh-mem-vec128-plo-no.stderr.exp-64bit-le
index 5edfff1a5df6910aafcd2fbb1ae458f3502331d7..e7786272403564268a96c986ee830970851560ad 100644 (file)
--- a/memcheck/tests/common/sh-mem-vec128-plo-no.stderr.exp-64bit-le
+++ b/memcheck/tests/common/sh-mem-vec128-plo-no.stderr.exp-64bit-le
@@ -1,4 +1,3 @@
-
 sh-mem-vec128: config: little-endian, 64-bit word size
 
 20537   136   171    75    38    63   139    23     5   110    66   421   194    86   232   115 
@@ -529,13 +528,3 @@ Invalid read of size 16
 dddddddddddddddd
 
 
-
-HEAP SUMMARY:
-    in use at exit: 0 bytes in 0 blocks
-  total heap usage: 33 allocs, 33 frees, 82,048 bytes allocated
-
-For a detailed leak analysis, rerun with: --leak-check=full
-
-Use --track-origins=yes to see where uninitialised values come from
-For lists of detected and suppressed errors, rerun with: -s
-ERROR SUMMARY: 66 errors from 66 contexts (suppressed: 0 from 0)

diff --git a/memcheck/tests/common/sh-mem-vec128-plo-yes.stderr.exp-64bit-le b/memcheck/tests/common/sh-mem-vec128-plo-yes.stderr.exp-64bit-le
index d05ac5e8262843047e912386ba1df970e9ba63bf..86abd93cce8681a53ffee62bd82e49948965c4af 100644 (file)
--- a/memcheck/tests/common/sh-mem-vec128-plo-yes.stderr.exp-64bit-le
+++ b/memcheck/tests/common/sh-mem-vec128-plo-yes.stderr.exp-64bit-le
@@ -1,4 +1,3 @@
-
 sh-mem-vec128: config: little-endian, 64-bit word size
 
 20537   136   171    75    38    63   139    23     5   110    66   421   194    86   232   115 
@@ -436,13 +435,3 @@ Invalid read of size 16
 dddddddddddddddd
 
 
-
-HEAP SUMMARY:
-    in use at exit: 0 bytes in 0 blocks
-  total heap usage: 33 allocs, 33 frees, 82,048 bytes allocated
-
-For a detailed leak analysis, rerun with: --leak-check=full
-
-Use --track-origins=yes to see where uninitialised values come from
-For lists of detected and suppressed errors, rerun with: -s
-ERROR SUMMARY: 51 errors from 51 contexts (suppressed: 0 from 0)