You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by el...@apache.org on 2019/11/06 10:21:21 UTC
svn commit: r1869456 - /httpd/httpd/trunk/.travis.yml
Author: elukey
Date: Wed Nov 6 10:21:20 2019
New Revision: 1869456
URL: http://svn.apache.org/viewvc?rev=1869456&view=rev
Log:
Update travis config
* Add 'if TRAVIS_OS_NAME' to before_install/before_script/script to allow multi-os testing.
* Add separation lines in matrix config (better visual impact).
* Add Linux to all the current job's name.
* Add tests for Worker mpm.
Modified:
httpd/httpd/trunk/.travis.yml
Modified: httpd/httpd/trunk/.travis.yml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/.travis.yml?rev=1869456&r1=1869455&r2=1869456&view=diff
==============================================================================
--- httpd/httpd/trunk/.travis.yml (original)
+++ httpd/httpd/trunk/.travis.yml Wed Nov 6 10:21:20 2019
@@ -20,21 +20,29 @@ addons:
matrix:
include:
- - name: Default module set
- - name: Default, all-modules
+ - name: Linux Ubuntu, Default module set
+ # -------------------------------------------------------------------------
+ - name: Linux Ubuntu, Default, all-modules
env: CONFIG="--enable-mods-shared=reallyall --enable-load-all-modules"
- - name: Prefork MPM, all-modules
+ # -------------------------------------------------------------------------
+ - name: Linux Ubuntu, Prefork MPM, all-modules
env: CONFIG="--enable-mods-shared=reallyall --enable-load-all-modules --with-mpm=prefork"
- - name: Bionic, all-modules
+ # -------------------------------------------------------------------------
+ - name: Linux Ubuntu, Worker MPM, all-modules
+ env: CONFIG="--enable-mods-shared=reallyall --enable-load-all-modules --with-mpm=worker"
+ # -------------------------------------------------------------------------
+ - name: Linux Ubuntu Bionic, all-modules
os: linux
dist: bionic
env: CONFIG="--enable-mods-shared=reallyall --enable-load-all-modules"
- - name: GCC 7 maintainer-mode w/-Werror
+ # -------------------------------------------------------------------------
+ - name: Linux Ubuntu Bionic, GCC 7 maintainer-mode w/-Werror
os: linux
dist: bionic
env: CONFIG="--enable-mods-shared=reallyall --enable-load-all-modules --enable-maintainer-mode NOTEST_CFLAGS=-Werror CC=gcc-7"
SKIP_TESTING=1
- - name: GCC 8 maintainer-mode w/-Werror
+ # -------------------------------------------------------------------------
+ - name: Linux Ubuntu, GCC 8 maintainer-mode w/-Werror
env: CONFIG="--enable-mods-shared=reallyall --enable-load-all-modules --enable-maintainer-mode NOTEST_CFLAGS=-Werror CC=gcc-8"
SKIP_TESTING=1
addons:
@@ -53,19 +61,25 @@ matrix:
- libsystemd-dev
- libnghttp2-dev
- libjansson-dev
+ # -------------------------------------------------------------------------
+
before_install:
- - cpanm --local-lib=~/perl5 local::lib && eval $(perl -I ~/perl5/lib/perl5/ -Mlocal::lib)
- - cpanm --notest Net::SSL LWP::Protocol::https ExtUtils::Embed Test::More AnyEvent DateTime
- HTTP::DAV Protocol::HTTP2::Client FCGI
+ - if [ "$TRAVIS_OS_NAME" = "linux" ]; then
+ cpanm --local-lib=~/perl5 local::lib && eval $(perl -I ~/perl5/lib/perl5/ -Mlocal::lib);
+ cpanm --notest Net::SSL LWP::Protocol::https ExtUtils::Embed Test::More AnyEvent DateTime HTTP::DAV Protocol::HTTP2::Client FCGI;
+ fi
before_script:
- - svn export -q https://svn.apache.org/repos/asf/apr/apr/trunk srclib/apr
- - test -v SKIP_TESTING || svn export -q https://svn.apache.org/repos/asf/httpd/test/framework/trunk test/perl-framework
+ - if [ "$TRAVIS_OS_NAME" = "linux" ]; then
+ svn export -q https://svn.apache.org/repos/asf/apr/apr/trunk srclib/apr;
+ test -v SKIP_TESTING || svn export -q https://svn.apache.org/repos/asf/httpd/test/framework/trunk test/perl-framework;
+ fi
script:
- - ./buildconf
- - test -v SKIP_TESTING || CONFIG="--with-test-suite=test/perl-framework $CONFIG"
- - ./configure $CONFIG --with-apr=/usr --with-apr-util=/usr
- - make $MAKEFLAGS -j2
- - test -v SKIP_TESTING || make check
-
+ - if [ "$TRAVIS_OS_NAME" = "linux" ]; then
+ ./buildconf;
+ test -v SKIP_TESTING || CONFIG="--with-test-suite=test/perl-framework $CONFIG";
+ ./configure $CONFIG --with-apr=/usr --with-apr-util=/usr;
+ make $MAKEFLAGS -j2;
+ test -v SKIP_TESTING || make check;
+ fi