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

branch.



git-svn-id: svn://svn.valgrind.org/valgrind/trunk@9549 a5019735-40e9-0310-863c-91ae7b9d1cf9

7 files changed, 7 insertions, 11 deletions

diff --git a/none/tests/Makefile.am b/none/tests/Makefile.am
index 832b7236f..81cde99c4 100644
--- 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
index e69de29bb..000000000
--- a/none/tests/blockfault.stdout.exp
+++ /dev/null
diff --git a/none/tests/filter_stderr b/none/tests/filter_stderr
index 60a780b1a..adb76265e 100755
--- 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 0368ced62..1a254956a 100644
--- 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
index 3996437b8..3db619239 100644
--- 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
index 8b85798b4..bb9f8f24f 100644
--- 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
index 88e325592..88e325592 100644
--- a/none/tests/blockfault.vgtest
+++ b/none/tests/linux/blockfault.vgtest