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.

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

diff --git a/.travis.yml b/.travis.yml
index 156db958a726e8e36a105d1c0aaf1fb186c648a6..bfdc373784ae7c4d8b185d0287190982c3c34215 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -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