From 13e765c30449bced9ca3fa8b2b59e76e7bb4ec98 Mon Sep 17 00:00:00 2001 From: Nicholas Nethercote Date: Wed, 15 Apr 2009 07:11:36 +0000 Subject: [PATCH] Merged r9546..r9548 (moved blockfault, and filtering fixes) from the DARWIN branch. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@9549 --- memcheck/tests/filter_stderr | 3 --- none/tests/Makefile.am | 3 +-- none/tests/blockfault.stdout.exp | 0 none/tests/filter_stderr | 3 --- none/tests/linux/Makefile.am | 2 ++ none/tests/{ => linux}/blockfault.c | 8 +++----- none/tests/{ => linux}/blockfault.stderr.exp | 2 +- none/tests/{ => linux}/blockfault.vgtest | 0 tests/filter_stderr_basic | 6 +++++- 9 files changed, 12 insertions(+), 15 deletions(-) delete mode 100644 none/tests/blockfault.stdout.exp rename none/tests/{ => linux}/blockfault.c (81%) rename none/tests/{ => linux}/blockfault.stderr.exp (90%) rename none/tests/{ => linux}/blockfault.vgtest (100%) diff --git a/memcheck/tests/filter_stderr b/memcheck/tests/filter_stderr index 3044a158f4..9d070c2c9f 100755 --- 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 832b7236f7..81cde99c4a 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 e69de29bb2..0000000000 diff --git a/none/tests/filter_stderr b/none/tests/filter_stderr index 60a780b1a9..adb76265ea 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 0368ced62e..1a254956a7 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 similarity index 81% rename from none/tests/blockfault.c rename to none/tests/linux/blockfault.c index 3996437b8d..3db6192398 100644 --- a/none/tests/blockfault.c +++ b/none/tests/linux/blockfault.c @@ -1,6 +1,7 @@ #include #include #include +#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 8b85798b4b..bb9f8f24f0 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 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 90a660a8bf..6940c6b85a 100755 --- 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 .../" + -- 2.47.3