Bug 241072 List tools in --help output

diff --git a/NEWS b/NEWS
index 041ff5ba650060973e31950704d884a04b79c2bc..f2a380863bf3847220dea183a0984c3a8a03fbea 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -76,6 +76,7 @@ than mailing the developers (or mailing lists) directly -- bugs that
 are not entered into bugzilla tend to get forgotten about or ignored.
 
 170510  Don't warn about ioctl of size 0 without direction hint
+241072  List tools in --help output
 327548  false positive while destroying mutex
 351857  confusing error message about valid command line option
 392331  Spurious lock not held error from inside pthread_cond_timedwait

diff --git a/coregrind/m_main.c b/coregrind/m_main.c
index c966873e26a9add14c825134ac09ef12e71586a5..27ec4514331bc0d336b5bab5a13b122375bc88d6 100644 (file)
--- a/coregrind/m_main.c
+++ b/coregrind/m_main.c
@@ -87,6 +87,9 @@ static void usage_NORETURN ( int need_help )
 "\n"
 "  tool-selection option, with default in [ ]:\n"
 "    --tool=<name>             use the Valgrind tool named <name> [memcheck]\n"
+"                              available tools are:\n"
+"                              memcheck cachegrind callgrind helgrind drd\n"
+"                              massif dhat lackey none exp-bbv\n"
 "\n"
 "  basic user options for all Valgrind tools, with defaults in [ ]:\n"
 "    -h --help                 show this message\n"

diff --git a/none/tests/cmdline1.stdout.exp b/none/tests/cmdline1.stdout.exp
index de5fcd819acf3db7068ccef30275ddcd9862b213..c0e71fa5760e93cdc5ded336a373b7ce1a505701 100644 (file)
--- a/none/tests/cmdline1.stdout.exp
+++ b/none/tests/cmdline1.stdout.exp
@@ -2,6 +2,9 @@ usage: valgrind [options] prog-and-args
 
   tool-selection option, with default in [ ]:
     --tool=<name>             use the Valgrind tool named <name> [memcheck]
+                              available tools are:
+                              memcheck cachegrind callgrind helgrind drd
+                              massif dhat lackey none exp-bbv
 
   basic user options for all Valgrind tools, with defaults in [ ]:
     -h --help                 show this message
@@ -31,8 +34,6 @@ usage: valgrind [options] prog-and-args
     --log-fd=<number>         log messages to file descriptor [2=stderr]
     --log-file=<file>         log messages to <file>
     --log-socket=ipaddr:port  log messages to socket ipaddr:port
-    --enable-debuginfod=no|yes query debuginfod servers for missing
-                              debuginfo [yes]
 
   user options for Valgrind tools that report errors:
     --xml=yes                 emit error output in XML (some tools only)

diff --git a/none/tests/cmdline2.stdout.exp b/none/tests/cmdline2.stdout.exp
index d810cc7fa36edebcc677191d3a443bcb0440d93d..c19fa7259739b7bde4bbca05c660b4e3d2f20f99 100644 (file)
--- a/none/tests/cmdline2.stdout.exp
+++ b/none/tests/cmdline2.stdout.exp
@@ -2,6 +2,9 @@ usage: valgrind [options] prog-and-args
 
   tool-selection option, with default in [ ]:
     --tool=<name>             use the Valgrind tool named <name> [memcheck]
+                              available tools are:
+                              memcheck cachegrind callgrind helgrind drd
+                              massif dhat lackey none exp-bbv
 
   basic user options for all Valgrind tools, with defaults in [ ]:
     -h --help                 show this message
@@ -31,8 +34,6 @@ usage: valgrind [options] prog-and-args
     --log-fd=<number>         log messages to file descriptor [2=stderr]
     --log-file=<file>         log messages to <file>
     --log-socket=ipaddr:port  log messages to socket ipaddr:port
-    --enable-debuginfod=no|yes query debuginfod servers for missing
-                              debuginfo [yes]
 
   user options for Valgrind tools that report errors:
     --xml=yes                 emit error output in XML (some tools only)