Solaris regtest: aligned / sized expecteds and an improved filter

A couple of testcases fail due to ever changing output for floating
point infinity.

Add memalign and aligned_alloc expecteds for Solaris 11.3
(which doesn't have aligned_allloc).

diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am
index e216521b5e7d6c571a6f0421d3553b26ca0096f2..4442d945ccc480ea3ae3917242a8ffb1582ad9c6 100644 (file)
--- a/memcheck/tests/Makefile.am
+++ b/memcheck/tests/Makefile.am
@@ -257,6 +257,7 @@ EXTRA_DIST = \
        memalign_args.vgtest memalign_args.stderr.exp \
                memalign_args.stderr.exp-glibc \
                memalign_args.stderr.exp-darwin \
+               memalign_args.stderr.exp-solaris \
        memcmptest.stderr.exp memcmptest.stderr.exp2 \
        memcmptest.stdout.exp memcmptest.vgtest \
        memmem.stderr.exp memmem.vgtest \

diff --git a/memcheck/tests/memalign_args.stderr.exp-solaris b/memcheck/tests/memalign_args.stderr.exp-solaris
new file mode 100644 (file)
index 0000000..c255e02
--- /dev/null
+++ b/memcheck/tests/memalign_args.stderr.exp-solaris
@@ -0,0 +1,11 @@
+Conditional jump or move depends on uninitialised value(s)
+   at 0x........: memalign (vg_replace_malloc.c:...)
+   by 0x........: main (memalign_args.c:19)
+
+Conditional jump or move depends on uninitialised value(s)
+   at 0x........: posix_memalign (vg_replace_malloc.c:...)
+   by 0x........: main (memalign_args.c:23)
+
+Conditional jump or move depends on uninitialised value(s)
+   at 0x........: valloc (vg_replace_malloc.c:...)
+   by 0x........: main (memalign_args.c:31)

diff --git a/memcheck/tests/sized_aligned_new_delete_misaligned b/memcheck/tests/sized_aligned_new_delete_misaligned
new file mode 100755 (executable)
index 0000000..1c69036
Binary files /dev/null and b/memcheck/tests/sized_aligned_new_delete_misaligned differ

diff --git a/memcheck/tests/solaris/Makefile.am b/memcheck/tests/solaris/Makefile.am
index fe1e2ca3fb34b06651bc31c754b41d2bd26e54e0..f80a23448d89cf89ffc14a65fc722a999abeff3c 100644 (file)
--- a/memcheck/tests/solaris/Makefile.am
+++ b/memcheck/tests/solaris/Makefile.am
@@ -13,6 +13,7 @@ noinst_HEADERS = scalar.h
 
 EXTRA_DIST = \
        aligned_alloc.stderr.exp aligned_alloc.vgtest \
+       aligned_alloc.stderr.exp-solaris \
        brk.stderr.exp brk.stdout.exp brk.vgtest \
        context_stack_die.stderr.exp context_stack_die.stdout.exp context_stack_die.vgtest \
        door_data.stderr.exp door_data.stdout.exp door_data.vgtest \

diff --git a/memcheck/tests/solaris/aligned_alloc.stderr.exp-solaris b/memcheck/tests/solaris/aligned_alloc.stderr.exp-solaris
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/none/tests/amd64/filter_inf_nan b/none/tests/amd64/filter_inf_nan
index ce40f21dc8eb099dffcb9353f8d8b2d85d309d65..1e660e5a7cb0c1e0a9a2c9758a0062456872b5e9 100755 (executable)
--- a/none/tests/amd64/filter_inf_nan
+++ b/none/tests/amd64/filter_inf_nan
@@ -1,9 +1,9 @@
 #! /bin/sh
 
-# Solaris libc prints 'Inf' or 'Infinity' instead of 'inf'
+# Solaris libc prints 'Inf' or 'Infinity' or 'infinity' instead of 'inf'
 # and 'NaN' instead of 'nan'. Filter these differences here.
-sed "s/-Infinity/     -inf/g" |
-sed "s/Infinity/     inf/g"   |
+sed "s/-[Ii]nfinity/     -inf/g" |
+sed "s/[Ii]nfinity/     inf/g"   |
 sed "s/Inf/inf/g"             |
 sed "s/NaN/nan/g"
 

diff --git a/none/tests/x86/filter_inf_nan b/none/tests/x86/filter_inf_nan
index b4ddfc9b1c9c8fcbdb30d459656eac1f56262c53..f70958cff1dfa3fe2911c656e06c67d68cb1b54e 100755 (executable)
--- a/none/tests/x86/filter_inf_nan
+++ b/none/tests/x86/filter_inf_nan
@@ -1,9 +1,9 @@
 #! /bin/sh
 
-# Solaris libc prints 'Infinity' instead of 'inf' and 'NaN' instead of 'nan'.
+# Solaris libc prints 'Infinity' or 'infinity' instead of 'inf' and 'NaN' instead of 'nan'.
 # Filter these differences here.
-sed "s/-Infinity/     -inf/g" |
-sed "s/Infinity/     inf/g"   |
+sed "s/-[Ii]nfinity/     -inf/g" |
+sed "s/[Ii]nfinity/     inf/g"   |
 sed "s/NaN/nan/g"
 
 exit 0