From: Joe Orton <jorton@apache.org>
Date: Wed, 15 Jul 2020 07:25:51 +0000 (+0000)
Subject: * docs/log-message-tags/update-log-msg-tags: Exit with non-zero
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1264
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8433964eb969ec1780c56560d31600f871060b2;p=thirdparty%2Fapache%2Fhttpd.git

* 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.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1879876 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/log-message-tags/update-log-msg-tags b/docs/log-message-tags/update-log-msg-tags
index 7eeebace0e9..9185adee14c 100755
--- a/docs/log-message-tags/update-log-msg-tags
+++ b/docs/log-message-tags/update-log-msg-tags
@@ -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 };
diff --git a/test/README.travis b/test/README.travis
index 2806a5fafe4..01a5bfcee49 100644
--- a/test/README.travis
+++ b/test/README.travis
@@ -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?