From e23b38512f1317ae7af03828ee85b39cd1a1eee4 Mon Sep 17 00:00:00 2001 From: Nicholas Nethercote Date: Wed, 13 Feb 2008 05:05:58 +0000 Subject: [PATCH] Fix minor breakage in 7 tests. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@7405 --- memcheck/tests/addressable.stderr.exp | 2 +- memcheck/tests/badjump.stderr.exp | 2 +- memcheck/tests/describe-block.stderr.exp | 2 +- memcheck/tests/filter_stderr | 3 +++ memcheck/tests/match-overrun.stderr.exp | 2 +- memcheck/tests/supp_unknown.stderr.exp | 2 +- none/tests/cmdline1.stdout.exp | 2 +- none/tests/cmdline2.stdout.exp | 2 +- 8 files changed, 10 insertions(+), 7 deletions(-) diff --git a/memcheck/tests/addressable.stderr.exp b/memcheck/tests/addressable.stderr.exp index 161aebb466..18cef1d612 100644 --- 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 51dd7dfa22..d6d3f7c2ea 100644 --- 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 fdba38f78f..9f277f2624 100644 --- 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 469f0c7798..7754d9046e 100755 --- 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 140d480da8..d20b599054 100644 --- 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 b47097e207..724fb79506 100644 --- 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 5d8889fd5e..d6a6bc22bf 100644 --- 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 ca5ff2201f..4eb01ed190 100644 --- 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. -- 2.47.3