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/12 12:45:58 UTC
svn commit: r1869697 - in /httpd/httpd/trunk: .travis.yml buildconf
test/travis_run_linux.sh
Author: jorton
Date: Tue Nov 12 12:45:57 2019
New Revision: 1869697
URL: http://svn.apache.org/viewvc?rev=1869697&view=rev
Log:
Add buildconf option to force (rather than suppress) regeneration of
the ap_expr parser. Add a Travis job which uses this, so a patch
which changes the parser sources is tested appropriately (e.g PR#72).
* buildconf: Add --with-regen-expr to force ap_expr regeneration.
* .travis.yml, test/travis_run_linux.sh: Pass BUILDCONF to buildconf
and add job which uses the new option.
Modified:
httpd/httpd/trunk/.travis.yml
httpd/httpd/trunk/buildconf
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=1869697&r1=1869696&r2=1869697&view=diff
==============================================================================
--- httpd/httpd/trunk/.travis.yml (original)
+++ httpd/httpd/trunk/.travis.yml Tue Nov 12 12:45:57 2019
@@ -62,6 +62,11 @@ matrix:
- libnghttp2-dev
- libjansson-dev
# -------------------------------------------------------------------------
+ - name: Linux Ubuntu, Regenerate ap_expr
+ os: linux
+ env: CONFIG="--enable-mods-shared=reallyall --enable-maintainer-mode NOTEST_CFLAGS=-Werror"
+ BUILDCONFIG="--with-regen-expr"
+ # -------------------------------------------------------------------------
- if: branch != 2.4.x
name: Linux Ubuntu, APR trunk
env: APR_VERSION=trunk APR_CONFIG="--with-crypto"
Modified: httpd/httpd/trunk/buildconf
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/buildconf?rev=1869697&r1=1869696&r2=1869697&view=diff
==============================================================================
--- httpd/httpd/trunk/buildconf (original)
+++ httpd/httpd/trunk/buildconf Tue Nov 12 12:45:57 2019
@@ -37,6 +37,10 @@ esac
apr_src_dir="srclib/apr ../apr"
apu_src_dir=""
+# By default, touch the checked-in sources to suppress regeneration of
+# the ap_expr parser.
+regen_expr=no
+
while test $# -gt 0
do
# Normalize
@@ -54,6 +58,10 @@ do
apu_src_dir=$optarg
;;
+ --with-regen-expr)
+ regen_expr=yes
+ ;;
+
-h|--help)
cat <<EOF
buildconf: generates the files needed to configure httpd.
@@ -74,6 +82,9 @@ Configuration:
"apr" replaced with "apr-util" or "aprutil". Ignored
in APR-Config Mode.
+ --with-regen-expr suppress the timestamp adjustment which prevents the
+ rebuild of the ap_expr expression parser
+
APR-Config Mode:
When passing an apr-config executable to --with-apr, buildconf will attempt to
@@ -316,13 +327,18 @@ if [ -f `which cut` ]; then
> httpd.spec )
fi
-# ensure that the ap_expr expression parser sources are never regenerated
-# when running make
-echo fixing timestamps for ap_expr sources
-cd server
-touch util_expr_parse.y util_expr_scan.l
-sleep 1
-touch util_expr_parse.c util_expr_parse.h util_expr_scan.c
-cd ..
+if [ x$regen_expr = xno ]; then
+ # ensure that the ap_expr expression parser sources are never regenerated
+ # when running make
+ echo buildconf: Fixing timestamps for ap_expr sources to prevent regeneration
+ cd server
+ touch util_expr_parse.y util_expr_scan.l
+ sleep 1
+ touch util_expr_parse.c util_expr_parse.h util_expr_scan.c
+ cd ..
+else
+ echo buildconf: Fixing timestamps for ap_expr sources to ensure regeneration
+ touch server/util_expr_parse.[yl]
+fi
exit 0
Modified: httpd/httpd/trunk/test/travis_run_linux.sh
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/travis_run_linux.sh?rev=1869697&r1=1869696&r2=1869697&view=diff
==============================================================================
--- httpd/httpd/trunk/test/travis_run_linux.sh (original)
+++ httpd/httpd/trunk/test/travis_run_linux.sh Tue Nov 12 12:45:57 2019
@@ -1,7 +1,7 @@
#!/bin/bash -ex
### Installed apr/apr-util don't include the *.m4 files but the
### Debian packages helpfully install them, so use the system APR to buildconf
-./buildconf --with-apr=/usr/bin/apr-1-config
+./buildconf --with-apr=/usr/bin/apr-1-config ${BUILDCONFIG}
# For trunk, "make check" is sufficient to run the test suite.
# For 2.4.x, the test suite must be run manually
if test ! -v SKIP_TESTING; then
Re: svn commit: r1869697 - in /httpd/httpd/trunk: .travis.yml
buildconf test/travis_run_linux.sh
Posted by Joe Orton <jo...@redhat.com>.
On Fri, Nov 15, 2019 at 08:10:28PM +0100, Ruediger Pluem wrote:
> > --- httpd/httpd/trunk/test/travis_run_linux.sh (original)
> > +++ httpd/httpd/trunk/test/travis_run_linux.sh Tue Nov 12 12:45:57 2019
> > @@ -1,7 +1,7 @@
> > #!/bin/bash -ex
> > ### Installed apr/apr-util don't include the *.m4 files but the
> > ### Debian packages helpfully install them, so use the system APR to buildconf
> > -./buildconf --with-apr=/usr/bin/apr-1-config
> > +./buildconf --with-apr=/usr/bin/apr-1-config ${BUILDCONFIG}
>
> Why don't we use the APR sources we download in travis_before_linux.sh at least if APR_VERSION is set?
> Like
>
> ./buildconf --with-apr=$HOME/build/apr-${APR_VERSION} ${BUILDCONFIG}
Mainly because of caching - the ~/build/apr-* directories are only
created in the case where a cached ~/root/apr-* is not available. It
might be useful to try more complicated combinations of buildconf too,
though this is simple and works everywhere for now.
Regards, Joe
Re: svn commit: r1869697 - in /httpd/httpd/trunk: .travis.yml
buildconf test/travis_run_linux.sh
Posted by Ruediger Pluem <rp...@apache.org>.
On 11/12/2019 01:45 PM, jorton@apache.org wrote:
> Author: jorton
> Date: Tue Nov 12 12:45:57 2019
> New Revision: 1869697
>
> URL: http://svn.apache.org/viewvc?rev=1869697&view=rev
> Log:
> Add buildconf option to force (rather than suppress) regeneration of
> the ap_expr parser. Add a Travis job which uses this, so a patch
> which changes the parser sources is tested appropriately (e.g PR#72).
>
> * buildconf: Add --with-regen-expr to force ap_expr regeneration.
>
> * .travis.yml, test/travis_run_linux.sh: Pass BUILDCONF to buildconf
> and add job which uses the new option.
>
> Modified:
> httpd/httpd/trunk/.travis.yml
> httpd/httpd/trunk/buildconf
> httpd/httpd/trunk/test/travis_run_linux.sh
>
> Modified: httpd/httpd/trunk/test/travis_run_linux.sh
> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/travis_run_linux.sh?rev=1869697&r1=1869696&r2=1869697&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/test/travis_run_linux.sh (original)
> +++ httpd/httpd/trunk/test/travis_run_linux.sh Tue Nov 12 12:45:57 2019
> @@ -1,7 +1,7 @@
> #!/bin/bash -ex
> ### Installed apr/apr-util don't include the *.m4 files but the
> ### Debian packages helpfully install them, so use the system APR to buildconf
> -./buildconf --with-apr=/usr/bin/apr-1-config
> +./buildconf --with-apr=/usr/bin/apr-1-config ${BUILDCONFIG}
Why don't we use the APR sources we download in travis_before_linux.sh at least if APR_VERSION is set?
Like
./buildconf --with-apr=$HOME/build/apr-${APR_VERSION} ${BUILDCONFIG}
> # For trunk, "make check" is sufficient to run the test suite.
> # For 2.4.x, the test suite must be run manually
> if test ! -v SKIP_TESTING; then
>
>
>
Regards
Rüdiger