svn commit: r1879876 - in /httpd/httpd/trunk: docs/log-message-tags/update-log-msg-tags test/README.travis

[jo...@apache.org]

Author: jorton
Date: Wed Jul 15 07:25:51 2020
New Revision: 1879876

URL: http://svn.apache.org/viewvc?rev=1879876&view=rev
Log:
* docs/log-message-tags/update-log-msg-tags: Exit with non-zero
  so inconsistent state is caught as a failure.

* test/README.travis: APLOGNO() sanity checking is done.

Modified:
    httpd/httpd/trunk/docs/log-message-tags/update-log-msg-tags
    httpd/httpd/trunk/test/README.travis

Modified: httpd/httpd/trunk/docs/log-message-tags/update-log-msg-tags
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/log-message-tags/update-log-msg-tags?rev=1879876&r1=1879875&r2=1879876&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/log-message-tags/update-log-msg-tags (original)
+++ httpd/httpd/trunk/docs/log-message-tags/update-log-msg-tags Wed Jul 15 07:25:51 2020
@@ -8,6 +8,7 @@ my $serial_file = "$basedir/next-number"
 my $serial = read_serial($serial_file);
 my $orig_serial = $serial;
 my %tags;
+my $rv = 0;
 
 my %intended_duplicate_tags;
 if (open(my $fh, "<", "$basedir/intended-duplicates")) {
@@ -34,7 +35,7 @@ foreach my $tag (sort keys %tags) {
 }
 write_file("$basedir/list", $list);
 
-exit 0;
+exit $rv;
 
 sub process
 {
@@ -135,9 +136,11 @@ sub note_tag
     }
     if (exists $tags{$tag} and not exists $intended_duplicate_tags{$tag}) {
         print STDERR "WARNING: Duplicate tag $tag at $tags{$tag}->{file}:$tags{$tag}->{line} and $file:$lineno\n";
+        $rv = 1;
     }
     if ($tag >= $serial) {
         print STDERR "WARNING: next-number $serial inconsistent with tag $tag at $file:$lineno, adjusting\n";
+        $rv = 1;
         $serial = $tag + 1;
     }
     $tags{$tag} = { file => $file, line => $lineno, msg => $oneline };

Modified: httpd/httpd/trunk/test/README.travis
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/README.travis?rev=1879876&r1=1879875&r2=1879876&view=diff
==============================================================================
--- httpd/httpd/trunk/test/README.travis (original)
+++ httpd/httpd/trunk/test/README.travis Wed Jul 15 07:25:51 2020
@@ -60,8 +60,6 @@ TODO list
 * Windows build
 * clang-on-Linux build
 * Use containers for non-Ubuntu-based Linux testing
-* sanity checks for use of APLOGNO() - empty arguments, accidental duplicates, etc.
- - not sure how exactly
 * Known test failures
  - "apt-get install" timeout/fails - workaround by moving apt install to before_script phase?