Re: svn commit: r1869697 - in /httpd/httpd/trunk: .travis.yml buildconf test/travis_run_linux.sh

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

Re: svn commit: r1869697 - in /httpd/httpd/trunk: .travis.yml buildconf test/travis_run_linux.sh

Ruediger Pluem


On 11/12/2019 01:45 PM, [hidden email] 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

Reply | Threaded
Open this post in threaded view
|

Re: svn commit: r1869697 - in /httpd/httpd/trunk: .travis.yml buildconf test/travis_run_linux.sh

Joe Orton
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