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/08 09:46:50 UTC
svn commit: r1869533 - in /httpd/httpd/trunk: .travis.yml
test/travis_before_linux.sh test/travis_run_linux.sh
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/.travis.yml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/.travis.yml?rev=1869533&r1=1869532&r2=1869533&view=diff
==============================================================================
--- httpd/httpd/trunk/.travis.yml (original)
+++ httpd/httpd/trunk/.travis.yml Fri Nov 8 09:46:50 2019
@@ -4,6 +4,7 @@ os:
cache:
directories:
- /home/travis/perl5
+ - /home/travis/root
addons:
apt:
packages:
@@ -62,6 +63,16 @@ matrix:
- libnghttp2-dev
- libjansson-dev
# -------------------------------------------------------------------------
+ - name: Linux Ubuntu, APR 1.7.0, APR-util 1.6.1
+ env: APR_VERSION=1.7.0 APU_VERSION=1.6.1
+ # -------------------------------------------------------------------------
+ - name: Linux Ubuntu, APR 1.7.0 --enable-pool-debug, APR-util 1.6.1
+ env: APR_VERSION=1.7.0 APR_CONFIG="--enable-pool-debug"
+ APU_VERSION=1.6.1
+ # -------------------------------------------------------------------------
+ - name: Linux Ubuntu, APR 1.5.1, APR-util 1.5.4
+ env: APR_VERSION=1.5.1 APU_VERSION=1.5.4
+ # -------------------------------------------------------------------------
before_install:
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then
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 ;;
+ *) 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
Modified: httpd/httpd/trunk/test/travis_run_linux.sh
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/travis_run_linux.sh?rev=1869533&r1=1869532&r2=1869533&view=diff
==============================================================================
--- httpd/httpd/trunk/test/travis_run_linux.sh (original)
+++ httpd/httpd/trunk/test/travis_run_linux.sh Fri Nov 8 09:46:50 2019
@@ -11,7 +11,17 @@ if test ! -v SKIP_TESTING; then
CONFIG="--prefix=$HOME/build/httpd-root $CONFIG"
fi
fi
-./configure $CONFIG --with-apr=/usr --with-apr-util=/usr
+if test -v APR_VERSION; then
+ CONFIG="$CONFIG --with-apr=$HOME/root/apr-${APR_VERSION}"
+else
+ CONFIG="$CONFIG --with-apr=/usr"
+fi
+if test -v APU_VERSION; then
+ CONFIG="$CONFIG --with-apr-util=$HOME/root/apu-${APU_VERSION}"
+else
+ CONFIG="$CONFIG --with-apr-util=/usr"
+fi
+./configure $CONFIG
make $MAKEFLAGS -j2
if ! test -v SKIP_TESTING; then
if test -v WITH_TEST_SUITE; then
Re: svn commit: r1869533 - in /httpd/httpd/trunk: .travis.yml
test/travis_before_linux.sh test/travis_run_linux.sh
Posted by Christophe JAILLET <ch...@wanadoo.fr>.
Hi,
Le 08/11/2019 à 10:46, jorton@apache.org a écrit :
> 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/.travis.yml
> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/.travis.yml?rev=1869533&r1=1869532&r2=1869533&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/.travis.yml (original)
> +++ httpd/httpd/trunk/.travis.yml Fri Nov 8 09:46:50 2019
> @@ -4,6 +4,7 @@ os:
> cache:
> directories:
> - /home/travis/perl5
> + - /home/travis/root
> addons:
> apt:
> packages:
> @@ -62,6 +63,16 @@ matrix:
> - libnghttp2-dev
> - libjansson-dev
> # -------------------------------------------------------------------------
> + - name: Linux Ubuntu, APR 1.7.0, APR-util 1.6.1
> + env: APR_VERSION=1.7.0 APU_VERSION=1.6.1
> + # -------------------------------------------------------------------------
> + - name: Linux Ubuntu, APR 1.7.0 --enable-pool-debug, APR-util 1.6.1
> + env: APR_VERSION=1.7.0 APR_CONFIG="--enable-pool-debug"
> + APU_VERSION=1.6.1
> + # -------------------------------------------------------------------------
> + - name: Linux Ubuntu, APR 1.5.1, APR-util 1.5.4
> + env: APR_VERSION=1.5.1 APU_VERSION=1.5.4
> + # -------------------------------------------------------------------------
Any particular reason to stick to APR 1.5.1 instead of 1.5.2?
CJ
Re: svn commit: r1869533 - in /httpd/httpd/trunk: .travis.yml
test/travis_before_linux.sh test/travis_run_linux.sh
Posted by Ruediger Pluem <rp...@apache.org>.
On 11/08/2019 10:46 AM, jorton@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