From af09b2fa0329ec5b0b1159a2218928146c719ecc Mon Sep 17 00:00:00 2001
From: Nicholas Nethercote <njn@valgrind.org>
Date: Thu, 30 Apr 2009 05:09:09 +0000
Subject: [PATCH] Fix test breakage caused by r9694.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@9697
---
 coregrind/m_signals.c                  | 8 ++++----
 memcheck/tests/addressable.stderr.exp  | 7 ++++---
 memcheck/tests/badjump.stderr.exp      | 7 ++++---
 memcheck/tests/supp_unknown.stderr.exp | 7 ++++---
 none/tests/linux/blockfault.stderr.exp | 7 ++++---
 5 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/coregrind/m_signals.c b/coregrind/m_signals.c
index a3f879a4b..f51d130fe 100644
--- a/coregrind/m_signals.c
+++ b/coregrind/m_signals.c
@@ -1330,10 +1330,10 @@ static void default_action(const vki_siginfo_t *info, ThreadId tid)
       if (sigNo == VKI_SIGSEGV 
           && info && is_signal_from_kernel(info->si_code)
           && info->si_code == VKI_SEGV_MAPERR) {
-         VG_UMSG("If you believe this happened as a result of a stack" );
-         VG_UMSG("overflow in your program's main thread (unlikely but");
-         VG_UMSG("possible), you can try to increase the size of the"  );
-         VG_UMSG("main thread stack using the --main-stacksize= flag." );
+         VG_UMSG(" If you believe this happened as a result of a stack" );
+         VG_UMSG(" overflow in your program's main thread (unlikely but");
+         VG_UMSG(" possible), you can try to increase the size of the"  );
+         VG_UMSG(" main thread stack using the --main-stacksize= flag." );
          // FIXME: assumes main ThreadId == 1
          if (VG_(is_valid_tid)(1)) {
             VG_UMSG(" The main thread stack size used in this run was %d.",
diff --git a/memcheck/tests/addressable.stderr.exp b/memcheck/tests/addressable.stderr.exp
index ad76e96c7..e000d04ef 100644
--- a/memcheck/tests/addressable.stderr.exp
+++ b/memcheck/tests/addressable.stderr.exp
@@ -19,9 +19,10 @@ Process terminating with default action of signal N (SIGSEGV or SIGBUS)
  Bad memory (SIGSEGV or SIGBUS) at address 0x........
    at 0x........: test2 (addressable.c:51)
    by 0x........: main (addressable.c:125)
- 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.
+ 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 ....
 
 ERROR SUMMARY: 2 errors from 2 contexts (suppressed: 0 from 0)
diff --git a/memcheck/tests/badjump.stderr.exp b/memcheck/tests/badjump.stderr.exp
index 9187d7221..eddcd3840 100644
--- a/memcheck/tests/badjump.stderr.exp
+++ b/memcheck/tests/badjump.stderr.exp
@@ -8,9 +8,10 @@ Process terminating with default action of signal 11 (SIGSEGV)
  Access not within mapped region at address 0x........
    at 0x........: ???
    by 0x........: (below main)
- 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.
+ 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 ....
 
 ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0)
diff --git a/memcheck/tests/supp_unknown.stderr.exp b/memcheck/tests/supp_unknown.stderr.exp
index 1d4bfa5cf..a176358e8 100644
--- a/memcheck/tests/supp_unknown.stderr.exp
+++ b/memcheck/tests/supp_unknown.stderr.exp
@@ -3,7 +3,8 @@ Process terminating with default action of signal 11 (SIGSEGV)
  Access not within mapped region at address 0x........
    at 0x........: ???
    by 0x........: (below main)
- 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.
+ 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 ....
diff --git a/none/tests/linux/blockfault.stderr.exp b/none/tests/linux/blockfault.stderr.exp
index bb9f8f24f..b57c03735 100644
--- a/none/tests/linux/blockfault.stderr.exp
+++ b/none/tests/linux/blockfault.stderr.exp
@@ -3,8 +3,9 @@
 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.
+ 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 ....