Merged r9546..r9548 (moved blockfault, and filtering fixes) from the DARWIN

branch.

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

diff --git a/memcheck/tests/filter_stderr b/memcheck/tests/filter_stderr
index 3044a158f48eb3642a7aac30db1ef34a6163fa83..9d070c2c9f25269cf60b4215f5cf73f068b07738 100755 (executable)
--- a/memcheck/tests/filter_stderr
+++ b/memcheck/tests/filter_stderr
@@ -13,9 +13,6 @@ sed "/^Memcheck, a memory error detector/ , /./ d" |
 # Anonymise line numbers in mc_replace_strmem.c
 sed "s/mc_replace_strmem.c:[0-9]*/mc_replace_strmem.c:.../"  |
 
-# Remove the size in "The main thread stack size..." message.
-sed "s/The main thread stack size used in this run was [0-9]*/The main thread stack size used in this run was .../" |
-
 # Replace exit_group() with exit(), because you can get either on Linux
 # depending on the system.
 perl -p -e "s/param exit_group\(status\)/param exit(status)/" |

diff --git a/none/tests/Makefile.am b/none/tests/Makefile.am
index 832b7236f74db7a2c1e24601a9de3185f5b56ad4..81cde99c4a452fa3265e5a452f21b50b976ee7b9 100644 (file)
--- a/none/tests/Makefile.am
+++ b/none/tests/Makefile.am
@@ -35,7 +35,6 @@ EXTRA_DIST = $(noinst_SCRIPTS) \
        args.stderr.exp args.stdout.exp args.vgtest \
        async-sigs.stderr.exp async-sigs.stdout.exp async-sigs.vgtest \
        bitfield1.stderr.exp bitfield1.vgtest \
-       blockfault.vgtest blockfault.stderr.exp blockfault.stdout.exp \
        bug129866.vgtest bug129866.stderr.exp bug129866.stdout.exp \
        closeall.stderr.exp closeall.vgtest \
        cmdline0.stderr.exp cmdline0.stdout.exp cmdline0.vgtest \
@@ -127,7 +126,7 @@ EXTRA_DIST = $(noinst_SCRIPTS) \
 
 check_PROGRAMS = \
        ansi args \
-       async-sigs bitfield1 blockfault \
+       async-sigs bitfield1 \
        bug129866 \
        closeall coolo_strlen \
        discard exec-sigmask execve faultstatus fcntl_setown \

diff --git a/none/tests/blockfault.stdout.exp b/none/tests/blockfault.stdout.exp
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/none/tests/filter_stderr b/none/tests/filter_stderr
index 60a780b1a9f6d31e51a054b41a64a1b9dd8fd2ba..adb76265ea649c48405e20bbab74241c2f84aee7 100755 (executable)
--- a/none/tests/filter_stderr
+++ b/none/tests/filter_stderr
@@ -7,9 +7,6 @@ $dir/../../tests/filter_stderr_basic |
 # Remove "Nulgrind, ..." line and the following copyright line.
 sed "/^Nulgrind, a binary JIT-compiler./ , /./ d" |
 
-# Remove the size in "The main thread stack size..." message.
-sed "s/The main thread stack size used in this run was [0-9]*/The main thread stack size used in this run was .../" |
-
 # Anonymise addresses
 $dir/../../tests/filter_addresses
 

diff --git a/none/tests/linux/Makefile.am b/none/tests/linux/Makefile.am
index 0368ced62e72cf2ac64c81be1965bfb78c54eda4..1a254956a7d83664695de517b27cd0ede8231eba 100644 (file)
--- a/none/tests/linux/Makefile.am
+++ b/none/tests/linux/Makefile.am
@@ -4,11 +4,13 @@ include $(top_srcdir)/Makefile.tool-tests.am
 noinst_SCRIPTS = filter_stderr
 
 EXTRA_DIST = $(noinst_SCRIPTS) \
+       blockfault.stderr.exp blockfault.vgtest \
        mremap.stderr.exp mremap.stdout.exp mremap.vgtest \
        mremap2.stderr.exp mremap2.stdout.exp mremap2.stdout.exp2 \
            mremap2.stdout.exp-glibc28-amd64 mremap2.vgtest
 
 check_PROGRAMS = \
+       blockfault \
        mremap \
        mremap2
 

diff --git a/none/tests/blockfault.c b/none/tests/linux/blockfault.c
similarity index 81%
rename from none/tests/blockfault.c
rename to none/tests/linux/blockfault.c
index 3996437b8d590ea1d53e62dee38a22e9b2feb50b..3db619239894be2867d3d9a2887f46f36a6ab466 100644 (file)
--- a/none/tests/blockfault.c
+++ b/none/tests/linux/blockfault.c
@@ -1,6 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <signal.h>
+#include "tests/sys_mman.h"
 
 static void handler(int sig, siginfo_t *info, void *v)
 {
@@ -13,10 +14,7 @@ static void handler(int sig, siginfo_t *info, void *v)
    the default handler */
 int main()
 {
-#if defined(_AIX)
-  printf("this test hangs when run (even natively) on AIX\n");
-  return 0;
-#endif
+       int* unmapped_page = get_unmapped_page();
        struct sigaction sa;
        sigset_t mask;
 
@@ -29,7 +27,7 @@ int main()
        sigfillset(&mask);
        sigprocmask(SIG_BLOCK, &mask, NULL);
 
-       *(volatile int *)12345 = 213;
+       *(volatile int *)unmapped_page = 213;
 
        return 0;
 }

diff --git a/none/tests/blockfault.stderr.exp b/none/tests/linux/blockfault.stderr.exp
similarity index 90%
rename from none/tests/blockfault.stderr.exp
rename to none/tests/linux/blockfault.stderr.exp
index 8b85798b4b2560caaf9fcb170316520e19a498ac..bb9f8f24f02c425bf4687c3140075fbf0d02fc00 100644 (file)
--- a/none/tests/blockfault.stderr.exp
+++ b/none/tests/linux/blockfault.stderr.exp
@@ -2,7 +2,7 @@
 
 Process terminating with default action of signal 11 (SIGSEGV)
  Access not within mapped region at address 0x........
-   at 0x........: main (blockfault.c:32)
+   at 0x........: main (blockfault.c:30)
  If you believe this happened as a result of a stack overflow in your
  program's main thread (unlikely but possible), you can try to increase
  the size of the main thread stack using the --main-stacksize= flag.

diff --git a/none/tests/blockfault.vgtest b/none/tests/linux/blockfault.vgtest
similarity index 100%
rename from none/tests/blockfault.vgtest
rename to none/tests/linux/blockfault.vgtest

diff --git a/tests/filter_stderr_basic b/tests/filter_stderr_basic
index 90a660a8bff7fc369e56685e95ea6e2fa2fab4aa..6940c6b85a3f2b40dfda0a497545ce36fb2a39e2 100755 (executable)
--- a/tests/filter_stderr_basic
+++ b/tests/filter_stderr_basic
@@ -46,4 +46,8 @@ sed -r "/^(Segmentation fault|Alarm clock|Aborted|Bus error)( \(core dumped\))?$
 
 # Remove any ": dumping core" message as the user might have a
 # limit set that prevents the core dump
-sed "s/\(signal [0-9]* (SIG[A-Z]*)\): dumping core/\1/"
+sed "s/\(signal [0-9]* (SIG[A-Z]*)\): dumping core/\1/" |
+
+# Remove the size in "The main thread stack size..." message.
+sed "s/The main thread stack size used in this run was [0-9]*/The main thread stack size used in this run was .../"
+