From: Luca Toscano <elukey@apache.org>
Date: Wed, 6 Nov 2019 10:21:20 +0000 (+0000)
Subject: Update travis config
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1822
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f7ab72c21b755f5459c93820e9acf7afecb3d93;p=thirdparty%2Fapache%2Fhttpd.git

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.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1869456 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/.travis.yml b/.travis.yml
index 66ec54bc72d..63302ca3c43 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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