Merge r1875469 from trunk:

Test exclsion doesn't work since "tag !~" matches when tag is undefined.
Exclude tests from 2.4.x by explicitly matching against master.  Will
have to revisit this for 2.5.x.

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

diff --git a/.travis.yml b/.travis.yml
index 8e3211c7929252a585e0f83dde6f42902f3b551e..cabc03676b6c7d9e2da594e785db9122b26e27e3 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -97,7 +97,7 @@ jobs:
       env: CONFIG="--enable-mods-shared=reallyall --enable-maintainer-mode NOTEST_CFLAGS=-Werror CC=gcc-7"
            SKIP_TESTING=1
     # -------------------------------------------------------------------------
-    - if: branch != 2.4.x or tag !~ /^2.4/
+    - if: branch = master
       name: Linux Ubuntu, PCRE 1, GCC 7 maintainer-mode w/-Werror
       os: linux
       env: CONFIG="--enable-mods-shared=reallyall --with-pcre=/usr/bin/pcre-config --enable-maintainer-mode NOTEST_CFLAGS=-Werror CC=gcc-7"
@@ -143,14 +143,14 @@ jobs:
             - libpcre2-dev
     # -------------------------------------------------------------------------
     # MFLAGS= works around https://bz.apache.org/bugzilla/show_bug.cgi?id=63942
-    - if: branch != 2.4.x or tag !~ /^2.4/
+    - if: branch = master
       name: Linux Ubuntu, Regenerate ap_expr
       os: linux
       env: CONFIG="--enable-mods-shared=reallyall --enable-maintainer-mode NOTEST_CFLAGS=-Werror"
            BUILDCONFIG="--with-regen-expr"
            MFLAGS=
     # -------------------------------------------------------------------------
-    - if: branch != 2.4.x or tag !~ /^2.4/
+    - if: branch = master
       name: Linux Ubuntu, APR trunk
       env: APR_VERSION=trunk APR_CONFIG="--with-crypto"
            CONFIG="--enable-mods-shared=reallyall"
@@ -217,7 +217,7 @@ jobs:
       env: APR_VERSION=1.4.8 APU_VERSION=1.4.2
            CONFIG="--enable-mods-shared=reallyall"
     # -------------------------------------------------------------------------
-    - if: branch != 2.4.x or tag !~ /^2.4/
+    - if: branch = master
       name: Linux Ubuntu, UBSan
       env: NOTEST_CFLAGS="-fsanitize=undefined -fno-sanitize-recover=undefined" NOTEST_LIBS=-lubsan
            CONFIG="--enable-mods-shared=reallyall --disable-http2" TEST_UBSAN=1