Add 'treat_warning_as_error' support.

Signed-off-by: Henry Cox <[email protected]>

Author: henry2cox

bin/geninfo

@@ -932,7 +932,11 @@ sub find_files
     }
     foreach my $directory (@_) {
         unless (-e $directory) {
-            # hold error until the end of processing...
+            # hold error until the end of processing - we might be looking
+            #  for both .gcno and .gcda files - and don't want to generate
+            #   the same 'no such directory' message twice.  Nor do we want
+            #  to produce an error if only one type of file is in this
+            # directory
             $self->[2]->{$directory} = [$lcovutil::ERROR_USAGE,
                                         "no such file or directory '$directory'"
             ];
@@ -961,6 +965,7 @@ sub find_files
             my @found = split(' ', $stdout);
             if (!@found) {
                 if (!defined($processGcno) || $processGcno != 2) {
+                    # delay message: might be a file of other type here
                     $self->[2]->{$directory} = [
                                              $lcovutil::ERROR_EMPTY,
                                              "no $ext files found in $directory"
@@ -969,6 +974,7 @@ sub find_files
 
                 next;
             }
+            # we found something here - remove the pending error message, if any
             delete($self->[2]->{$directory})
                 ;    # if exists($self->[2]->{$directory});
             lcovutil::info("Found %d %s files in %s\n",

lcovrc

@@ -64,6 +64,11 @@ max_message_count = 100
 # See the man pages for more detail
 #stop_on_error = 1
 
+# If nonzero, treat warnings as error
+# note that ignored messages will still appear as warnings
+# Default is 0
+#treat_warning_as_error = 1
+
 # If set to non-zero, only issue particluar warning once per file
 # Default is 1
 #warn_once_per_file = 1

lib/lcovutil.pm

@@ -186,7 +186,8 @@ my @lcovErrs = (["annotate", \$ERROR_ANNOTATE_SCRIPT],
 our %lcovErrors;
 
 our $stop_on_error;                # attempt to keep going
-our $warn_once_per_file = 1;
+our $treat_warning_as_error = 0;
+our $warn_once_per_file     = 1;
 our $excessive_count_threshold;    # default not set: don't check
 
 our $br_coverage   = 0;    # If set, generate branch coverage statistics
@@ -1075,6 +1076,7 @@ my %rc_common = (
              "ignore_errors"          => \@rc_ignore,
              "max_message_count"      => \$lcovutil::suppressAfter,
              'stop_on_error'          => \$lcovutil::stop_on_error,
+             'treat_warning_as_error' => \$lcovutil::treat_warning_as_error,
              'warn_once_per_file'     => \$lcovutil::warn_once_per_file,
              "rtl_file_extensions"    => \$rtlExtensions,
              "c_file_extensions"      => \$cExtensions,
@@ -1969,6 +1971,10 @@ sub ignorable_error($$;$)
 sub ignorable_warning($$;$)
 {
     my ($code, $msg, $quiet) = @_;
+    if ($lcovutil::treat_warning_as_error) {
+        ignorable_error($code, $msg, $quiet);
+        return;
+    }
     die("undefined error code for '$msg'") unless defined($code);
 
     my $errName = "code_$code";

man/lcovrc.5

@@ -182,7 +182,7 @@ genhtml_med_limit = 75
 max_message_count = 100
 
 .br
-# If set, do not stop when an 'ignorable error' occurs - try
+# If nonzero, do not stop when an 'ignorable error' occurs - try
 .br
 #  to generate a result, however flawed.  This is equivalent to
 .br
@@ -192,7 +192,17 @@ max_message_count = 100
 .br
 #stop_on_error = 1
 
-# If set to non-zero, only issue particluar warning once per file
+.br
+# If nonzero, treat warnings as error
+.br
+# note that ignored messages will still appear as warnings
+.br
+# Default is 0
+.br
+#treat_warning_as_error = 1
+
+.br
+# If set to non-zero, only issue particular warning once per file
 .br
 # Default is 1
 .br
@@ -978,6 +988,22 @@ option is also used, then those messages will be treated as warnings rather than
 This option is used by genhtml, lcov, and geninfo.
 
 
+.PP
+
+.BR treat_warning_as_error " = "
+.IR 0|1
+.IP
+If set to 1, tell the tools that messages which are normally treated as
+warnings (
+.I e.g.,
+certain usage messages) should be treated as errors.
+
+Note that ignored messages will still appear as warnings:  see the
+.I ignore_errors
+entry, above.
+
+This option is used by genhtml, lcov, and geninfo.
+
 .PP
 
 .BR warn_once_per_file " = "