You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jo...@apache.org on 2020/07/30 15:26:15 UTC
svn commit: r1880455 - in /httpd/httpd/branches/2.4.x: ./ .travis.yml
test/travis_run_linux.sh
Author: jorton
Date: Thu Jul 30 15:26:15 2020
New Revision: 1880455
URL: http://svn.apache.org/viewvc?rev=1880455&view=rev
Log:
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]
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/.travis.yml
httpd/httpd/branches/2.4.x/test/travis_run_linux.sh
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1880453
Modified: httpd/httpd/branches/2.4.x/.travis.yml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/.travis.yml?rev=1880455&r1=1880454&r2=1880455&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/.travis.yml (original)
+++ httpd/httpd/branches/2.4.x/.travis.yml Thu Jul 30 15:26:15 2020
@@ -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
Modified: httpd/httpd/branches/2.4.x/test/travis_run_linux.sh
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/test/travis_run_linux.sh?rev=1880455&r1=1880454&r2=1880455&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/test/travis_run_linux.sh (original)
+++ httpd/httpd/branches/2.4.x/test/travis_run_linux.sh Thu Jul 30 15:26:15 2020
@@ -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