diff options
| author | Joe Orton <jorton@apache.org> | 2019-11-08 15:29:17 +0100 |
|---|---|---|
| committer | Joe Orton <jorton@apache.org> | 2019-11-08 15:29:17 +0100 |
| commit | 53ec69f3ca116f843da301b4e12a56100d623807 (patch) | |
| tree | a8edf8177a648356c04fdcbff83d6822d33b8b31 /test/travis_before_linux.sh | |
| parent | Start sketching out some travis docs and check we can -> [skip ci] (diff) | |
| download | apache2-53ec69f3ca116f843da301b4e12a56100d623807.tar.xz apache2-53ec69f3ca116f843da301b4e12a56100d623807.zip | |
Add shared-mpms build, add build against APR trunk (httpd trunk only).
Fix handling and ensure safe caching of APR trunk build.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1869564 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'test/travis_before_linux.sh')
| -rwxr-xr-x | test/travis_before_linux.sh | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/test/travis_before_linux.sh b/test/travis_before_linux.sh index 6f076a2da4..999837f3ae 100755 --- a/test/travis_before_linux.sh +++ b/test/travis_before_linux.sh @@ -3,21 +3,32 @@ 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 + # For APR trunk the cached version at ~/root/apr-trunk will be + # stale if the current trunk revision is different from that of + # the cached build. Here, cache and check the rev number of the + # build accordingly. + trunk_url=https://svn.apache.org/repos/asf/apr/apr/trunk + if test $APR_VERSION = trunk; then + trunk_rev=`svn info --show-item last-changed-revision ${trunk_url}` + # Blow away the cached trunk install if the revision does not + # match. + test -f $HOME/root/apr-trunk/.revision-is-${trunk_rev} || rm -rf $HOME/root/apr-trunk + fi 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} ;; + trunk) svn export -q -r ${trunk_rev} ${trunk_url} $HOME/build/apr-trunk ;; + *) svn export -q https://svn.apache.org/repos/asf/apr/apr/tags/${APR_VERSION} \ + $HOME/build/apr-${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 + if test -v trunk_rev; then + # Record the revision built in the cache. + touch $HOME/root/apr-${APR_VERSION}/.revision-is-${trunk_rev} + fi popd APU_CONFIG="$APU_CONFIG --with-apr=$HOME/root/apr-${APR_VERSION}" fi |