From: Joe Orton <jorton@apache.org>
Date: Thu, 30 Jul 2020 14:39:01 +0000 (+0000)
Subject: For non-trunk run a simpler APLOGNO() test using grep which
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1249
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=262a5f499d4b7414847f2bb4a8b580118896c0ad;p=thirdparty%2Fapache%2Fhttpd.git

For non-trunk run a simpler APLOGNO() test using grep which
only catches missing arguments, but this is better than nothing.


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

diff --git a/.travis.yml b/.travis.yml
index 9f068e2ce6b..e21ff3799f0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,8 +43,7 @@ jobs:
   include:
     - name: Linux Ubuntu, Default module set
     # -------------------------------------------------------------------------
-    - if: *condition_not_24x
-      name: Empty APLOGNO() test
+    - name: Empty APLOGNO() test
       env: SKIP_TESTING=1 TEST_LOGNO=1
     # -------------------------------------------------------------------------
     - name: Linux s390x Ubuntu, all-modules
diff --git a/test/travis_run_linux.sh b/test/travis_run_linux.sh
index f52b5fd94aa..d1925f5b2d8 100755
--- a/test/travis_run_linux.sh
+++ b/test/travis_run_linux.sh
@@ -1,13 +1,28 @@
 #!/bin/bash -ex
 
-# Test for empty APLOGNO() macro use; if the script changes
-# any files, the git diff will be non-empty and fail.
+# Test for APLOGNO() macro errors (duplicates, empty args) etc.  For
+# trunk, run the updater script to see if it fails.  If it succeeds
+# and changes any files (because there was a missing argument), the
+# git diff will be non-empty, so fail for that case too.  For
+# non-trunk use a grep and only catch the empty argument case.
 if test -v TEST_LOGNO; then
-    find server modules os -name \*.c | xargs perl \
-		docs/log-message-tags/update-log-msg-tags
-    git diff --exit-code .
-    : PASSED
-    exit 0
+    if test -f docs/log-message-tags/update-log-msg-tags; then
+        find server modules os -name \*.c | \
+            xargs perl docs/log-message-tags/update-log-msg-tags
+        git diff --exit-code .
+        : PASSED
+        exit 0
+    else
+        set -o pipefail
+        if find server modules os -name \*.c | \
+                xargs grep -C1 --color=always 'APLOGNO()'; then
+            : FAILED
+            exit 1
+        else
+            : PASSED
+            exit 0
+        fi
+    fi
 fi
 
 ### Installed apr/apr-util don't include the *.m4 files but the