From 9214c37d49698196647ff7772c2fd0c498770b9d Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Tue, 24 Jun 2014 05:08:21 +0000
Subject: [PATCH] Rename --defaultsupp into --default-suppressions as requested
 by Julian

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@14090
---
 coregrind/m_main.c             | 6 ++++--
 docs/xml/manual-core.xml       | 2 +-
 drd/tests/std_thread2.vgtest   | 2 +-
 none/tests/cmdline1.stdout.exp | 3 ++-
 none/tests/cmdline2.stdout.exp | 3 ++-
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/coregrind/m_main.c b/coregrind/m_main.c
index ba12b4b587..4485f03585 100644
--- a/coregrind/m_main.c
+++ b/coregrind/m_main.c
@@ -127,7 +127,8 @@ static void usage_NORETURN ( Bool debug_help )
 "    --error-limit=no|yes      stop showing new errors if too many? [yes]\n"
 "    --error-exitcode=<number> exit code to return if errors found [0=disable]\n"
 "    --show-below-main=no|yes  continue stack traces below main() [no]\n"
-"    --defaultsupp=yes|no      load default suppressions [yes]\n"
+"    --default-suppressions=yes|no\n"
+"                              load default suppressions [yes]\n"
 "    --suppressions=<filename> suppress errors described in <filename>\n"
 "    --gen-suppressions=no|yes|all    print suppressions for errors? [no]\n"
 "    --db-attach=no|yes        start debugger when errors detected? [no]\n"
@@ -691,7 +692,8 @@ void main_process_cmd_line_options ( /*OUT*/Bool* logging_to_fd,
       else if VG_STR_CLO(arg, "--xml-user-comment",
                               VG_(clo_xml_user_comment)) {}
 
-      else if VG_BOOL_CLO(arg, "--defaultsupp", VG_(clo_default_supp)) { }
+      else if VG_BOOL_CLO(arg, "--default-suppressions",
+                          VG_(clo_default_supp)) { }
 
       else if VG_STR_CLO(arg, "--suppressions", tmp_str) {
          if (VG_(clo_n_suppressions) >= VG_CLO_MAX_SFILES) {
diff --git a/docs/xml/manual-core.xml b/docs/xml/manual-core.xml
index 0fd7f02d3e..1ab17728c3 100644
--- a/docs/xml/manual-core.xml
+++ b/docs/xml/manual-core.xml
@@ -398,7 +398,7 @@ run of <computeroutput>valgrind -v --tool=memcheck ls -l</computeroutput>:</para
 
 <para>Multiple suppressions files are allowed.  Valgrind loads suppression
 patterns from <filename>$PREFIX/lib/valgrind/default.supp</filename> unless
-<option>--defaultsupp=no</option> has been specified.  You can
+<option>--default-suppressions=no</option> has been specified.  You can
 ask to add suppressions from additional files by specifying
 <option>--suppressions=/path/to/file.supp</option> one or more times.
 </para>
diff --git a/drd/tests/std_thread2.vgtest b/drd/tests/std_thread2.vgtest
index c01563ac5f..d2d4603468 100644
--- a/drd/tests/std_thread2.vgtest
+++ b/drd/tests/std_thread2.vgtest
@@ -1,4 +1,4 @@
 prereq: test -e std_thread2 && ./supported_libpthread
-vgopts: --check-stack-var=yes --show-confl-seg=no --num-callers=1 --defaultsupp=no --suppressions=std_thread2.supp
+vgopts: --check-stack-var=yes --show-confl-seg=no --num-callers=1 --default-suppressions=no --suppressions=std_thread2.supp
 prog: std_thread2
 stderr_filter: filter_stderr
diff --git a/none/tests/cmdline1.stdout.exp b/none/tests/cmdline1.stdout.exp
index e0dfb12d30..e63d716613 100644
--- a/none/tests/cmdline1.stdout.exp
+++ b/none/tests/cmdline1.stdout.exp
@@ -40,7 +40,8 @@ usage: valgrind [options] prog-and-args
     --error-limit=no|yes      stop showing new errors if too many? [yes]
     --error-exitcode=<number> exit code to return if errors found [0=disable]
     --show-below-main=no|yes  continue stack traces below main() [no]
-    --defaultsupp=yes|no      load default suppressions [yes]
+    --default-suppressions=yes|no
+                              load default suppressions [yes]
     --suppressions=<filename> suppress errors described in <filename>
     --gen-suppressions=no|yes|all    print suppressions for errors? [no]
     --db-attach=no|yes        start debugger when errors detected? [no]
diff --git a/none/tests/cmdline2.stdout.exp b/none/tests/cmdline2.stdout.exp
index c679f6e3e0..e35b64e98b 100644
--- a/none/tests/cmdline2.stdout.exp
+++ b/none/tests/cmdline2.stdout.exp
@@ -40,7 +40,8 @@ usage: valgrind [options] prog-and-args
     --error-limit=no|yes      stop showing new errors if too many? [yes]
     --error-exitcode=<number> exit code to return if errors found [0=disable]
     --show-below-main=no|yes  continue stack traces below main() [no]
-    --defaultsupp=yes|no      load default suppressions [yes]
+    --default-suppressions=yes|no
+                              load default suppressions [yes]
     --suppressions=<filename> suppress errors described in <filename>
     --gen-suppressions=no|yes|all    print suppressions for errors? [no]
     --db-attach=no|yes        start debugger when errors detected? [no]
-- 
2.47.3