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/06/25 13:20:20 UTC

svn commit: r1879188 - in /httpd/httpd/branches/2.4.x: ./ .travis.yml

Author: jorton
Date: Thu Jun 25 13:20:19 2020
New Revision: 1879188

URL: http://svn.apache.org/viewvc?rev=1879188&view=rev
Log:
Merge r1879108, r1879109, r1879113, r1879115, r1879184 from trunk:

Test mod_cgid w/fdpassing.

Fix YAML syntax.

Disable mod_cgi to ensure mod_cgid is really being tested.

Mark fdpassing test as failing.

Add a plain mod_cgid build, explicitly without mod_cgi.


Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/.travis.yml

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1879108-1879109,1879113,1879115,1879184

Modified: httpd/httpd/branches/2.4.x/.travis.yml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/.travis.yml?rev=1879188&r1=1879187&r2=1879188&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/.travis.yml (original)
+++ httpd/httpd/branches/2.4.x/.travis.yml Thu Jun 25 13:20:19 2020
@@ -107,6 +107,13 @@ jobs:
       env: CONFIG="--enable-mods-shared=reallyall --enable-maintainer-mode" NOTEST_CFLAGS='-Werror -O2' CC=gcc-7
            SKIP_TESTING=1
     # -------------------------------------------------------------------------
+    - name: Linux Ubuntu, Event MPM, all-modules, mod_cgid only
+      env: CONFIG="--enable-mods-shared=reallyall --with-mpm=event --disable-cgi"
+    # -------------------------------------------------------------------------
+    - if: *condition_not_24x
+      name: Linux Ubuntu, Event MPM, all-modules, mod_cgid fdpassing
+      env: CONFIG="--enable-mods-shared=reallyall --with-mpm=event --disable-cgi --enable-cgid-fdpassing"
+    # -------------------------------------------------------------------------
     - if: *condition_not_24x
       name: Linux Ubuntu, PCRE 1, GCC 7 maintainer-mode w/-Werror
       os: linux
@@ -263,7 +270,9 @@ jobs:
       env: NOTEST_CFLAGS="-fsanitize=undefined -fno-sanitize-recover=undefined" NOTEST_LIBS=-lubsan
            CONFIG="--enable-mods-shared=reallyall --disable-http2" TEST_UBSAN=1
   allow_failures:
-    # non-x86 are sometimes flaky
+    # Currently broken:
+    - env: CONFIG="--enable-mods-shared=reallyall --with-mpm=event --disable-cgi --enable-cgid-fdpassing"
+    # Non-x86 are sometimes flaky:
     - arch: s390x
       env: CONFIG="--enable-mods-shared=reallyall"
     - arch: arm64