You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by yl...@apache.org on 2020/12/11 00:24:34 UTC
svn commit: r1884291 - in /httpd/httpd/branches/2.4.x: ./ .travis.yml
Author: ylavic
Date: Fri Dec 11 00:24:33 2020
New Revision: 1884291
URL: http://svn.apache.org/viewvc?rev=1884291&view=rev
Log:
Merge r1883776, r1883781, r1883813, r1884138, r1884182 from trunk:
For pool-debug builds, use APR/APR-util 1.7.x branches to pick
up e.g. the r1883751 locking fixes.
Re-enable mod_http2 and mod_ssl_ct in prefork pool-debug build
after r1883704 and r1883667.
[prefork+pool-debug still w/o http2 until r1884170 is backported]
Adjust name for pool-debug build.
Run the LDAP testing without pool-debug for the time being.
Cosmetics (and one more ci pass, just in case).
ci: have an ASan run w/o pool-debug too.
[ASan disabled on 2.4.x for now until r1883708+r1884208 are backported]
Submitted by: jorton, ylavic, ylavic
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:r1883776,1883781,1883813,1884138,1884182
Modified: httpd/httpd/branches/2.4.x/.travis.yml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/.travis.yml?rev=1884291&r1=1884290&r2=1884291&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/.travis.yml (original)
+++ httpd/httpd/branches/2.4.x/.travis.yml Fri Dec 11 00:24:33 2020
@@ -109,7 +109,8 @@ jobs:
# -------------------------------------------------------------------------
- name: Linux Ubuntu, GCC 7 maintainer-mode w/-Werror
os: linux
- env: CONFIG="--enable-mods-shared=reallyall --enable-maintainer-mode" NOTEST_CFLAGS='-Werror -O2' CC=gcc-7
+ 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
@@ -235,14 +236,29 @@ jobs:
APU_CONFIG="--with-crypto --with-ldap"
CLEAR_CACHE=1
# -------------------------------------------------------------------------
- - name: Linux Ubuntu, APR 1.7.0 --enable-pool-debug, APR-util 1.6.1
- env: APR_VERSION=1.7.0 APR_CONFIG="--enable-pool-debug"
- APU_VERSION=1.6.1 APU_CONFIG="--with-crypto --with-ldap"
+ - name: Linux Ubuntu, pool-debug
+ env: APR_VERSION=1.7.x APR_CONFIG="--enable-pool-debug"
+ APU_VERSION=1.7.x APU_CONFIG="--with-crypto --with-ldap"
CONFIG="--enable-mods-shared=reallyall"
TEST_MALLOC=1
+ CLEAR_CACHE=1
+ # -------------------------------------------------------------------------
+ - name: Linux Ubuntu, Shared MPMs (event), pool-debug, SSL/TLS variants
+ env: APR_VERSION=1.7.x APR_CONFIG="--enable-pool-debug"
+ APU_VERSION=1.7.x APU_CONFIG="--with-crypto --with-ldap"
+ CONFIG="--enable-mods-shared=reallyall --enable-mpms-shared=all --with-mpm=event"
+ TEST_MALLOC=1 TEST_SSL=1
+ CLEAR_CACHE=1
# -------------------------------------------------------------------------
- - name: Linux Ubuntu, APR 1.7.0, APR-util 1.6.1, pool-debug, LDAP
- env: APR_VERSION=1.7.0 APR_CONFIG="--enable-pool-debug"
+ - name: Linux Ubuntu, Shared MPMs (prefork), pool-debug, SSL/TLS variants
+ env: APR_VERSION=1.7.x APR_CONFIG="--enable-pool-debug"
+ APU_VERSION=1.7.x APU_CONFIG="--with-crypto --with-ldap"
+ CONFIG="--enable-mods-shared=reallyall --enable-mpms-shared=all --with-mpm=prefork --disable-http2"
+ TEST_MALLOC=1 TEST_SSL=1
+ CLEAR_CACHE=1
+ # -------------------------------------------------------------------------
+ - name: Linux Ubuntu, APR 1.7.0, APR-util 1.6.1, LDAP
+ env: APR_VERSION=1.7.0
APU_VERSION=1.6.1 APU_CONFIG="--with-crypto --with-ldap"
CONFIG="--enable-mods-shared=reallyall"
TEST_MALLOC=1 TEST_LDAP=1 TEST_ARGS="-defines LDAP"
@@ -285,7 +301,28 @@ jobs:
name: Linux Ubuntu Focal, UBSan
dist: focal
env: NOTEST_CFLAGS="-fsanitize=undefined -fno-sanitize-recover=undefined" NOTEST_LIBS=-lubsan
- CONFIG="--enable-mods-shared=reallyall --disable-http2" TEST_UBSAN=1
+ CONFIG="--enable-mods-shared=reallyall --disable-http2"
+ TEST_UBSAN=1
+ # -------------------------------------------------------------------------
+ - if: *condition_not_24x
+ name: Linux Ubuntu Focal, ASan
+ dist: focal
+ env: NOTEST_CFLAGS="-ggdb -fsanitize=address -fno-sanitize-recover=address -fno-omit-frame-pointer"
+ APR_VERSION=1.7.x
+ APU_VERSION=1.7.x APU_CONFIG="--with-crypto --with-ldap"
+ CONFIG="--enable-mods-shared=reallyall"
+ TEST_ASAN=1
+ CLEAR_CACHE=1
+ # -------------------------------------------------------------------------
+ - if: *condition_not_24x
+ name: Linux Ubuntu Focal, ASan, pool-debug
+ dist: focal
+ env: NOTEST_CFLAGS="-ggdb -fsanitize=address -fno-sanitize-recover=address -fno-omit-frame-pointer"
+ APR_VERSION=1.7.x APR_CONFIG="--enable-pool-debug"
+ APU_VERSION=1.7.x APU_CONFIG="--with-crypto --with-ldap"
+ CONFIG="--enable-mods-shared=reallyall"
+ TEST_ASAN=1
+ CLEAR_CACHE=1
allow_failures:
# Intermittent failures:
- env: CONFIG="--enable-mods-shared=reallyall --with-mpm=worker"