--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

diff --git a/coregrind/vg_main.c b/coregrind/vg_main.c
index 1ff98ce9e5d55b067cf9fc28c4cfc1483de2137b..53381180767276f29c3316b869189fa534075b8d 100644 (file)
--- a/coregrind/vg_main.c
+++ b/coregrind/vg_main.c
@@ -1481,7 +1481,7 @@ static void usage ( Bool debug_help )
 "    --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"

diff --git a/none/tests/cmdline1.stdout.exp b/none/tests/cmdline1.stdout.exp
index df7d03c27b3fdf95f4304e7031963d80c6858712..680082a0d5f28358b44a375c69c31e132b3a7997 100644 (file)
--- a/none/tests/cmdline1.stdout.exp
+++ b/none/tests/cmdline1.stdout.exp
@@ -23,7 +23,7 @@ usage: valgrind --tool=<toolname> [options] prog-and-args
     --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>

diff --git a/none/tests/cmdline2.stdout.exp b/none/tests/cmdline2.stdout.exp
index cc19e19161136b979442188c9bb2987fead029ed..34fff45bdfc9e77d89db2821719eec6d868be6cf 100644 (file)
--- a/none/tests/cmdline2.stdout.exp
+++ b/none/tests/cmdline2.stdout.exp
@@ -23,7 +23,7 @@ usage: valgrind --tool=<toolname> [options] prog-and-args
     --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>