Merge r1880453 from trunk:

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

[under CTR for Travis changes]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1880455 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/.travis.yml b/.travis.yml
index 9fd8ec26905e0046d44e0fac6aa4407767f9d95e..44eed28ff3da8f7d8f7b064da8f6174f3793a688 100644 (file)
--- 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 109494b1678fe54c1e330f4b357a29cd5dde3425..46ae64bb3386845a2bf528fa60640f71557086e9 100755 (executable)
--- 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