Merge fix for #161487 (number of suppression files is limited to 10)

git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_3_BRANCH@8069

diff --git a/coregrind/pub_core_options.h b/coregrind/pub_core_options.h
index 384a6a5e397b798c315f4c89137ab097510547bc..fb49267f56655288a8bd4b6a3710e9f1eeb30a81 100644 (file)
--- a/coregrind/pub_core_options.h
+++ b/coregrind/pub_core_options.h
@@ -40,7 +40,7 @@
 #include "pub_tool_options.h"
 
 /* The max number of suppression files. */
-#define VG_CLO_MAX_SFILES 10
+#define VG_CLO_MAX_SFILES 100
 
 /* Should we stop collecting errors if too many appear?  default: YES */
 extern Bool  VG_(clo_error_limit);

diff --git a/docs/xml/manual-core.xml b/docs/xml/manual-core.xml
index 95eb5df73b286361b51270e49f04eb54650be974..5f6fd262fbb31269a921ad58e1f541aef9d78d38 100644 (file)
--- a/docs/xml/manual-core.xml
+++ b/docs/xml/manual-core.xml
@@ -885,8 +885,8 @@ that can report errors, e.g. Memcheck, but not Cachegrind.</para>
     </term>
     <listitem>
       <para>Specifies an extra file from which to read descriptions of
-      errors to suppress.  You may use as many extra suppressions files
-      as you like.</para>
+      errors to suppress.  You may use up to 100 extra suppression
+      files.</para>
     </listitem>
   </varlistentry>