You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jo...@apache.org on 2019/11/20 09:38:14 UTC
svn commit: r1870047 - in /httpd/httpd/trunk: .travis.yml test/README.travis
test/travis_run_linux.sh
Author: jorton
Date: Wed Nov 20 09:38:14 2019
New Revision: 1870047
URL: http://svn.apache.org/viewvc?rev=1870047&view=rev
Log:
Specify make flags globally and work around PR 63942 for regeneration
of server/util_expr parser.
Modified:
httpd/httpd/trunk/.travis.yml
httpd/httpd/trunk/test/README.travis
httpd/httpd/trunk/test/travis_run_linux.sh
Modified: httpd/httpd/trunk/.travis.yml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/.travis.yml?rev=1870047&r1=1870046&r2=1870047&view=diff
==============================================================================
--- httpd/httpd/trunk/.travis.yml (original)
+++ httpd/httpd/trunk/.travis.yml Wed Nov 20 09:38:14 2019
@@ -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
Modified: httpd/httpd/trunk/test/README.travis
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/README.travis?rev=1870047&r1=1870046&r2=1870047&view=diff
==============================================================================
--- httpd/httpd/trunk/test/README.travis (original)
+++ httpd/httpd/trunk/test/README.travis Wed Nov 20 09:38:14 2019
@@ -19,7 +19,9 @@ The Travis scripts use the following env
* 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.
Modified: httpd/httpd/trunk/test/travis_run_linux.sh
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/travis_run_linux.sh?rev=1870047&r1=1870046&r2=1870047&view=diff
==============================================================================
--- httpd/httpd/trunk/test/travis_run_linux.sh (original)
+++ httpd/httpd/trunk/test/travis_run_linux.sh Wed Nov 20 09:38:14 2019
@@ -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