commit cc6cc144e2f346e0c68efcdea09e4dcc515c62e5
author njn <njn@a5019735-40e9-0310-863c-91ae7b9d1cf9> Sat Mar 12 20:59:29 2005 +0000
committer njn <njn@a5019735-40e9-0310-863c-91ae7b9d1cf9> Sat Mar 12 20:59:29 2005 +0000
tree 9e253b842e354603c510d115456e615d0f134564
parent add20df16de9d81de98b440de67ca88b01ac94ee

--num-callers default is now 12, so say that in the help.
Fix cmdline tests for match new --num-callers stuff.

MERGED FROM CVS HEAD



git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3315 a5019735-40e9-0310-863c-91ae7b9d1cf9

coregrind/vg_main.c

diff --git a/coregrind/vg_main.c b/coregrind/vg_main.c
index 1ff98ce..5338118 100644
--- a/coregrind/vg_main.c
+++ b/coregrind/vg_main.c
@@ -1481,7 +1481,7 @@
 "    --log-file-exactly=<file> log messages to <file>\n"
 "    --log-socket=ipaddr:port  log messages to socket ipaddr:port\n"
 "    --demangle=no|yes         automatically demangle C++ names? [yes]\n"
-"    --num-callers=<number>    show <num> callers in stack traces [4]\n"
+"    --num-callers=<number>    show <num> callers in stack traces [12]\n"
 "    --error-limit=no|yes      stop showing new errors if too many? [yes]\n"
 "    --show-below-main=no|yes  continue stack traces below main() [no]\n"
 "    --suppressions=<filename> suppress errors described in <filename>\n"

none/tests/cmdline1.stdout.exp

diff --git a/none/tests/cmdline1.stdout.exp b/none/tests/cmdline1.stdout.exp
index df7d03c..680082a 100644
--- a/none/tests/cmdline1.stdout.exp
+++ b/none/tests/cmdline1.stdout.exp
@@ -23,7 +23,7 @@
     --log-file-exactly=<file> log messages to <file>
     --log-socket=ipaddr:port  log messages to socket ipaddr:port
     --demangle=no|yes         automatically demangle C++ names? [yes]
-    --num-callers=<number>    show <num> callers in stack traces [4]
+    --num-callers=<number>    show <num> callers in stack traces [12]
     --error-limit=no|yes      stop showing new errors if too many? [yes]
     --show-below-main=no|yes  continue stack traces below main() [no]
     --suppressions=<filename> suppress errors described in <filename>

none/tests/cmdline2.stdout.exp

diff --git a/none/tests/cmdline2.stdout.exp b/none/tests/cmdline2.stdout.exp
index cc19e19..34fff45 100644
--- a/none/tests/cmdline2.stdout.exp
+++ b/none/tests/cmdline2.stdout.exp
@@ -23,7 +23,7 @@
     --log-file-exactly=<file> log messages to <file>
     --log-socket=ipaddr:port  log messages to socket ipaddr:port
     --demangle=no|yes         automatically demangle C++ names? [yes]
-    --num-callers=<number>    show <num> callers in stack traces [4]
+    --num-callers=<number>    show <num> callers in stack traces [12]
     --error-limit=no|yes      stop showing new errors if too many? [yes]
     --show-below-main=no|yes  continue stack traces below main() [no]
     --suppressions=<filename> suppress errors described in <filename>