Fix minor breakage in 7 tests.

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

diff --git a/memcheck/tests/addressable.stderr.exp b/memcheck/tests/addressable.stderr.exp
index 161aebb46601be59010ab58ed8821f78999d6d67..18cef1d6121f77ed893eb7fea028be575c109217 100644 (file)
--- a/memcheck/tests/addressable.stderr.exp
+++ b/memcheck/tests/addressable.stderr.exp
@@ -22,7 +22,7 @@ Process terminating with default action of signal 11 (SIGSEGV)
  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 16777216.
+ The main thread stack size used in this run was ....
 
 ERROR SUMMARY: 2 errors from 2 contexts (suppressed: 0 from 0)
 malloc/free: in use at exit: 0 bytes in 0 blocks.

diff --git a/memcheck/tests/badjump.stderr.exp b/memcheck/tests/badjump.stderr.exp
index 51dd7dfa220e7ba8f5c4ff27d11b928d3044934b..d6d3f7c2ea358d2628cb949aa8d8782b6474fa43 100644 (file)
--- a/memcheck/tests/badjump.stderr.exp
+++ b/memcheck/tests/badjump.stderr.exp
@@ -11,7 +11,7 @@ Process terminating with default action of signal 11 (SIGSEGV)
  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 16777216.
+ The main thread stack size used in this run was ....
 
 ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0)
 malloc/free: in use at exit: 0 bytes in 0 blocks.

diff --git a/memcheck/tests/describe-block.stderr.exp b/memcheck/tests/describe-block.stderr.exp
index fdba38f78f99d9a22552b94684d05472a2b4861e..9f277f2624af3027bcded4254b508eb14d560454 100644 (file)
--- a/memcheck/tests/describe-block.stderr.exp
+++ b/memcheck/tests/describe-block.stderr.exp
@@ -10,7 +10,7 @@ Process terminating with default action of signal 11 (SIGSEGV)
  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 16777216.
+ The main thread stack size used in this run was ....
 
 ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0)
 malloc/free: in use at exit: 0 bytes in 0 blocks.

diff --git a/memcheck/tests/filter_stderr b/memcheck/tests/filter_stderr
index 469f0c7798da096d097e008b2a8d9bfcf298b88b..7754d9046e4d9d9325e25dafd3ac7b5ee6fdc78e 100755 (executable)
--- a/memcheck/tests/filter_stderr
+++ b/memcheck/tests/filter_stderr
@@ -13,4 +13,7 @@ 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 .../" |
+
 $dir/../../tests/filter_test_paths

diff --git a/memcheck/tests/match-overrun.stderr.exp b/memcheck/tests/match-overrun.stderr.exp
index 140d480da8ebb74f9e5f4e074c25663f8df21d20..d20b599054b33ef238fe2b513e1b9b456cd746d2 100644 (file)
--- a/memcheck/tests/match-overrun.stderr.exp
+++ b/memcheck/tests/match-overrun.stderr.exp
@@ -7,7 +7,7 @@ Process terminating with default action of signal 11 (SIGSEGV)
  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 16777216.
+ The main thread stack size used in this run was ....
 
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
 malloc/free: in use at exit: 0 bytes in 0 blocks.

diff --git a/memcheck/tests/supp_unknown.stderr.exp b/memcheck/tests/supp_unknown.stderr.exp
index b47097e20788499e4b5b1c53aabdd646115dbd5c..724fb79506f82257cce388d02a774f388618f270 100644 (file)
--- a/memcheck/tests/supp_unknown.stderr.exp
+++ b/memcheck/tests/supp_unknown.stderr.exp
@@ -6,4 +6,4 @@ Process terminating with default action of signal 11 (SIGSEGV)
  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 16777216.
+ The main thread stack size used in this run was ....

diff --git a/none/tests/cmdline1.stdout.exp b/none/tests/cmdline1.stdout.exp
index 5d8889fd5eeb3bc25eefb91a18d29e3b55d38483..d6a6bc22bfbc519a4bb07de713a427c4bc770340 100644 (file)
--- a/none/tests/cmdline1.stdout.exp
+++ b/none/tests/cmdline1.stdout.exp
@@ -48,7 +48,7 @@ usage: valgrind [options] prog-and-args
 
   Extra options read from ~/.valgrindrc, $VALGRIND_OPTS, ./.valgrindrc
 
-  Valgrind is Copyright (C) 2000-2007 Julian Seward et al.
+  Valgrind is Copyright (C) 2000-2008 Julian Seward et al.
   and licensed under the GNU General Public License, version 2.
   Bug reports, feedback, admiration, abuse, etc, to: www.valgrind.org.
 

diff --git a/none/tests/cmdline2.stdout.exp b/none/tests/cmdline2.stdout.exp
index ca5ff2201fc99d3f186a7520a2b40802ce6a2a13..4eb01ed19009f0b5681ba879449977b23cd3e975 100644 (file)
--- a/none/tests/cmdline2.stdout.exp
+++ b/none/tests/cmdline2.stdout.exp
@@ -92,7 +92,7 @@ usage: valgrind [options] prog-and-args
 
   Extra options read from ~/.valgrindrc, $VALGRIND_OPTS, ./.valgrindrc
 
-  Valgrind is Copyright (C) 2000-2007 Julian Seward et al.
+  Valgrind is Copyright (C) 2000-2008 Julian Seward et al.
   and licensed under the GNU General Public License, version 2.
   Bug reports, feedback, admiration, abuse, etc, to: www.valgrind.org.