Re: svn commit: r1869533 - in /httpd/httpd/trunk: .travis.yml test/travis_before_linux.sh test/travis_run_linux.sh
On 11/08/2019 10:46 AM, jor...@apache.org wrote:
> Author: jorton
> Date: Fri Nov 8 09:46:50 2019
> New Revision: 1869533
>
> URL: http://svn.apache.org/viewvc?rev=1869533&view=rev
> Log:
> Add Travis support for multiple APR/APR-util versions.
> Add an APR build with --enable-pool-debug.
>
> Modified:
> httpd/httpd/trunk/.travis.yml
> httpd/httpd/trunk/test/travis_before_linux.sh
> httpd/httpd/trunk/test/travis_run_linux.sh
>
> Modified: httpd/httpd/trunk/test/travis_before_linux.sh
> URL:
> http://svn.apache.org/viewvc/httpd/httpd/trunk/test/travis_before_linux.sh?rev=1869533&r1=1869532&r2=1869533&view=diff
> ==
> --- httpd/httpd/trunk/test/travis_before_linux.sh (original)
> +++ httpd/httpd/trunk/test/travis_before_linux.sh Fri Nov 8 09:46:50 2019
> @@ -1,5 +1,39 @@
> #!/bin/bash -ex
> -svn export -q https://svn.apache.org/repos/asf/apr/apr/trunk srclib/apr
> if ! test -v SKIP_TESTING; then
> svn export -q https://svn.apache.org/repos/asf/httpd/test/framework/trunk
> test/perl-framework
> fi
> +if test -v APR_VERSION; then
> +if ! test -d $HOME/root/apr-${APR_VERSION}; then
> +case $APR_VERSION in
> +trunk) url=https://svn.apache.org/repos/asf/apr/apr/trunk ;;
> +*)
> url=https://svn.apache.org/repos/asf/apr/apr/tags/${APR_VERSION} ;;
> +esac
> +svn export -q ${url} $HOME/build/apr-${APR_VERSION}
> +pushd $HOME/build/apr-${APR_VERSION}
> +if [ $APR_VERSION = 1.4.1 ]; then
> +# 1.4.1 doesn't build with current libtool
> +svn cat
> https://svn.apache.org/repos/asf/apr/apr/tags/1.5.1/buildconf > buildconf
> +fi
> +./buildconf
> +./configure ${APR_CONFIG} --prefix=$HOME/root/apr-${APR_VERSION}
> +make -j2
> +make install
> +popd
> +APU_CONFIG="$APU_CONFIG --with-apr=$HOME/root/apr-${APR_VERSION}"
> +fi
> +fi
> +if test -v APU_VERSION; then
> +if ! test -d $HOME/root/apu-${APU_VERSION}; then
> +case $APU_VERSION in
> +trunk) url=https://svn.apache.org/repos/asf/apr/apr-util/trunk ;;
I thought that there is no APR-UTIL trunk any longer since all APR-UTIL trunk
development now happens on APR trunk as
both got merged.
> +*)
> url=https://svn.apache.org/repos/asf/apr/apr-util/tags/${APU_VERSION} ;;
> +esac
> +svn export -q ${url} $HOME/build/apu-${APU_VERSION}
> +pushd $HOME/build/apu-${APU_VERSION}
> +./buildconf --with-apr=$HOME/build/apr-${APR_VERSION}
> +./configure ${APU_CONFIG} --prefix=$HOME/root/apu-${APU_VERSION}
> +make -j2
> +make install
> +popd
> +fi
> +fi
>
Regards
Rüdiger
Re: svn commit: r1869697 - in /httpd/httpd/trunk: .travis.yml buildconf test/travis_run_linux.sh
On 11/12/2019 01:45 PM, jor...@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
Re: trunk APR version requirement
Great work. Thanks Joe and Luca. Regards Rüdiger On 11/12/2019 04:14 PM, Stefan Eissing wrote: > Very happy about this. Thanks a lot! > >> Am 12.11.2019 um 16:10 schrieb Yann Ylavic : >> >> On Tue, Nov 12, 2019 at 3:43 PM Luca Toscano wrote: >>> >>> Il giorno mar 12 nov 2019 alle ore 15:24 Eric Covener >>> ha scritto: > > 1. If travis results look stable this week, turn on e-mail notifications > to dev@ on Friday. > > 2. Friday following (22nd), disable the broken bits of buildbot if > nobody has salvaged it. +1 >>> >>> +1 >> >> +1 (and great job Jo & Luca!) > >
