|
From: <sv...@va...> - 2009-04-15 07:11:40
|
Author: njn
Date: 2009-04-15 08:11:36 +0100 (Wed, 15 Apr 2009)
New Revision: 9549
Log:
Merged r9546..r9548 (moved blockfault, and filtering fixes) from the DARWIN
branch.
Added:
trunk/none/tests/linux/blockfault.c
trunk/none/tests/linux/blockfault.stderr.exp
trunk/none/tests/linux/blockfault.vgtest
Removed:
trunk/none/tests/blockfault.c
trunk/none/tests/blockfault.stderr.exp
trunk/none/tests/blockfault.stdout.exp
trunk/none/tests/blockfault.vgtest
Modified:
trunk/memcheck/tests/filter_stderr
trunk/none/tests/Makefile.am
trunk/none/tests/filter_stderr
trunk/none/tests/linux/Makefile.am
trunk/tests/filter_stderr_basic
Modified: trunk/memcheck/tests/filter_stderr
===================================================================
--- trunk/memcheck/tests/filter_stderr 2009-04-15 07:01:34 UTC (rev 9548)
+++ trunk/memcheck/tests/filter_stderr 2009-04-15 07:11:36 UTC (rev 9549)
@@ -13,9 +13,6 @@
# 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)/" |
Modified: trunk/none/tests/Makefile.am
===================================================================
--- trunk/none/tests/Makefile.am 2009-04-15 07:01:34 UTC (rev 9548)
+++ trunk/none/tests/Makefile.am 2009-04-15 07:11:36 UTC (rev 9549)
@@ -35,7 +35,6 @@
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 @@
check_PROGRAMS = \
ansi args \
- async-sigs bitfield1 blockfault \
+ async-sigs bitfield1 \
bug129866 \
closeall coolo_strlen \
discard exec-sigmask execve faultstatus fcntl_setown \
Deleted: trunk/none/tests/blockfault.c
===================================================================
--- trunk/none/tests/blockfault.c 2009-04-15 07:01:34 UTC (rev 9548)
+++ trunk/none/tests/blockfault.c 2009-04-15 07:11:36 UTC (rev 9549)
@@ -1,35 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <signal.h>
-
-static void handler(int sig, siginfo_t *info, void *v)
-{
- printf("info: sig=%d code=%d addr=%p\n",
- info->si_signo, info->si_code, info->si_addr);
- exit(0);
-}
-
-/* Blocking a fault, ie SIGSEGV, won't work, and is the same as having
- the default handler */
-int main()
-{
-#if defined(_AIX)
- printf("this test hangs when run (even natively) on AIX\n");
- return 0;
-#endif
- struct sigaction sa;
- sigset_t mask;
-
- sa.sa_sigaction = handler;
- sigemptyset(&sa.sa_mask);
- sa.sa_flags = SA_SIGINFO;
-
- sigaction(SIGSEGV, &sa, NULL);
-
- sigfillset(&mask);
- sigprocmask(SIG_BLOCK, &mask, NULL);
-
- *(volatile int *)12345 = 213;
-
- return 0;
-}
Deleted: trunk/none/tests/blockfault.stderr.exp
===================================================================
--- trunk/none/tests/blockfault.stderr.exp 2009-04-15 07:01:34 UTC (rev 9548)
+++ trunk/none/tests/blockfault.stderr.exp 2009-04-15 07:11:36 UTC (rev 9549)
@@ -1,10 +0,0 @@
-
-
-Process terminating with default action of signal 11 (SIGSEGV)
- Access not within mapped region at address 0x........
- at 0x........: main (blockfault.c:32)
- 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.
- The main thread stack size used in this run was ....
-
Deleted: trunk/none/tests/blockfault.stdout.exp
===================================================================
Deleted: trunk/none/tests/blockfault.vgtest
===================================================================
--- trunk/none/tests/blockfault.vgtest 2009-04-15 07:01:34 UTC (rev 9548)
+++ trunk/none/tests/blockfault.vgtest 2009-04-15 07:11:36 UTC (rev 9549)
@@ -1 +0,0 @@
-prog: blockfault
Modified: trunk/none/tests/filter_stderr
===================================================================
--- trunk/none/tests/filter_stderr 2009-04-15 07:01:34 UTC (rev 9548)
+++ trunk/none/tests/filter_stderr 2009-04-15 07:11:36 UTC (rev 9549)
@@ -7,9 +7,6 @@
# 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
Modified: trunk/none/tests/linux/Makefile.am
===================================================================
--- trunk/none/tests/linux/Makefile.am 2009-04-15 07:01:34 UTC (rev 9548)
+++ trunk/none/tests/linux/Makefile.am 2009-04-15 07:11:36 UTC (rev 9549)
@@ -4,11 +4,13 @@
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
Copied: trunk/none/tests/linux/blockfault.c (from rev 9546, branches/DARWIN/none/tests/linux/blockfault.c)
===================================================================
--- trunk/none/tests/linux/blockfault.c (rev 0)
+++ trunk/none/tests/linux/blockfault.c 2009-04-15 07:11:36 UTC (rev 9549)
@@ -0,0 +1,33 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <signal.h>
+#include "tests/sys_mman.h"
+
+static void handler(int sig, siginfo_t *info, void *v)
+{
+ printf("info: sig=%d code=%d addr=%p\n",
+ info->si_signo, info->si_code, info->si_addr);
+ exit(0);
+}
+
+/* Blocking a fault, ie SIGSEGV, won't work, and is the same as having
+ the default handler */
+int main()
+{
+ int* unmapped_page = get_unmapped_page();
+ struct sigaction sa;
+ sigset_t mask;
+
+ sa.sa_sigaction = handler;
+ sigemptyset(&sa.sa_mask);
+ sa.sa_flags = SA_SIGINFO;
+
+ sigaction(SIGSEGV, &sa, NULL);
+
+ sigfillset(&mask);
+ sigprocmask(SIG_BLOCK, &mask, NULL);
+
+ *(volatile int *)unmapped_page = 213;
+
+ return 0;
+}
Copied: trunk/none/tests/linux/blockfault.stderr.exp (from rev 9546, branches/DARWIN/none/tests/linux/blockfault.stderr.exp)
===================================================================
--- trunk/none/tests/linux/blockfault.stderr.exp (rev 0)
+++ trunk/none/tests/linux/blockfault.stderr.exp 2009-04-15 07:11:36 UTC (rev 9549)
@@ -0,0 +1,10 @@
+
+
+Process terminating with default action of signal 11 (SIGSEGV)
+ Access not within mapped region at address 0x........
+ 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.
+ The main thread stack size used in this run was ....
+
Copied: trunk/none/tests/linux/blockfault.vgtest (from rev 9546, branches/DARWIN/none/tests/linux/blockfault.vgtest)
===================================================================
--- trunk/none/tests/linux/blockfault.vgtest (rev 0)
+++ trunk/none/tests/linux/blockfault.vgtest 2009-04-15 07:11:36 UTC (rev 9549)
@@ -0,0 +1 @@
+prog: blockfault
Modified: trunk/tests/filter_stderr_basic
===================================================================
--- trunk/tests/filter_stderr_basic 2009-04-15 07:01:34 UTC (rev 9548)
+++ trunk/tests/filter_stderr_basic 2009-04-15 07:11:36 UTC (rev 9549)
@@ -46,4 +46,8 @@
# 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 .../"
+
|