From: Joe Orton <jorton@apache.org>
Date: Wed, 20 Nov 2019 09:38:14 +0000 (+0000)
Subject: Specify make flags globally and work around PR 63942 for regeneration
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1780
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e925273902842fab7060c91cfd4ba7ba44db3ca;p=thirdparty%2Fapache%2Fhttpd.git

Specify make flags globally and work around PR 63942 for regeneration
of server/util_expr parser.


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

diff --git a/.travis.yml b/.travis.yml
index bf550ed5b27..15e9a841608 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,6 +21,9 @@ addons:
       - libnghttp2-dev
       - libjansson-dev
       - libpcre2-dev
+env:
+  global:
+    - MFLAGS=-j2
 
 matrix:
   include:
@@ -68,10 +71,12 @@ matrix:
             - libjansson-dev
             - libpcre2-dev
     # -------------------------------------------------------------------------
+    # MFLAGS= works around https://bz.apache.org/bugzilla/show_bug.cgi?id=63942
     - 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
       name: Linux Ubuntu, APR trunk
diff --git a/test/README.travis b/test/README.travis
index 8bc91220684..d73f4068675 100644
--- a/test/README.travis
+++ b/test/README.travis
@@ -19,7 +19,9 @@ The Travis scripts use the following environment variables:
 * CONFIG - arguments to pass to httpd's configure script.
 
 * BUILDCONFIG - arguments to pass when running httpd's ./buildconf script
-  
+
+* MFLAGS - arguments to pass when running "make" for httpd.
+
 * SKIP_TESTING - if set, the Perl test framework is not run for the
   build.
 
diff --git a/test/travis_run_linux.sh b/test/travis_run_linux.sh
index 52442b7f46d..5f1268fe692 100755
--- a/test/travis_run_linux.sh
+++ b/test/travis_run_linux.sh
@@ -24,7 +24,7 @@ else
     CONFIG="$CONFIG --with-apr-util=/usr"
 fi
 ./configure $CONFIG
-make $MAKEFLAGS -j2
+make $MFLAGS
 if ! test -v SKIP_TESTING; then
     if test -v WITH_TEST_SUITE; then
         make check