Author: brane
Date: Sat Oct 27 00:12:29 2018
New Revision: 1844929
URL: http://svn.apache.org/viewvc?rev=1844929&view=rev
Log:
Update the macOS build scripts after the builder upgrade and move
to using dependencies from Homebrew.
[in tools/buildbot/slaves/svn-x64-macosx]
* setenv.sh
(SVNBB_APR, SVNBB_APRUTIL): New.
(SVNBB_APR_15): Removed.
* svnbuild.sh: Update default APR/Util and Serf config options.
Enable BDB6+ since the brewed one is much newer than 5.
* svncheck.sh: Set the APACHE_MPM option for DAV tests.
Modified:
subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/setenv.sh
subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/svnbuild.sh
subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/svncheck.sh
Modified: subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/setenv.sh
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/setenv.sh?rev=1844929&r1=1844928&r2=1844929&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/setenv.sh (original)
+++ subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/setenv.sh Sat Oct 27
00:12:29 2018
@@ -24,8 +24,9 @@
## SVNBB_SERF Serf installation prefix
## Note: Serf should be built only
## with the system APR/-Util.
+## SVNBB_APR Path of the default APR
+## SVNBB_APRUTIL Path of the default APR-Util
## SVNBB_APR_13_NOTHREAD Path of APR-1.3 with threading disabled
-## SVNBB_APR_15 Path of APR-1.5
## SVNBB_APR_20_DEV Path of APR-2.0
## SVNBB_JUNIT The path of the junit.jar
## SVNBB_PARALLEL Optional: parallelization; defaults to 2
@@ -45,7 +46,8 @@ export SVNBB_BDB
export SVNBB_SWIG
export SVNBB_SERF
export SVNBB_APR_13_NOTHREAD
-export SVNBB_APR_15
+export SVNBB_APR
+export SVNBB_APRUTIL
export SVNBB_APR_20_DEV
export SVNBB_JUNIT
export SVNBB_PARALLEL
Modified: subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/svnbuild.sh
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/svnbuild.sh?rev=1844929&r1=1844928&r2=1844929&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/svnbuild.sh (original)
+++ subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/svnbuild.sh Sat Oct
27 00:12:29 2018
@@ -27,11 +27,13 @@ scripts=$(cd $(dirname "$0") && pwd)
${scripts}/mkramdisk.sh ${volume_name} ${ramconf}
# These are the default APR and Serf config options
-serfconfig="--with-serf=${SVNBB_SERF} --with-apxs=/usr/sbin/apxs"
+serfconfig=" --with-serf=${SVNBB_SERF}
--with-apxs=/usr/local/opt/httpd/bin/apxs"
# An optional parameter tells build scripts which version of APR to use
if [ ! -z "$1" ]; then
aprdir=$(eval 'echo $SVNBB_'"$1")
+else
+ aprconfig="--with-apr=${SVNBB_APR} --with-apr-util=${SVNBB_APRUTIL}"
fi
if [ ! -z "${aprdir}" -a -d "${aprdir}" ]; then
aprconfig="--with-apr=${aprdir} --with-apr-util=${aprdir}"
@@ -91,6 +93,7 @@ ${abssrc}/configure \
${aprconfig}${serfconfig} \
--with-swig="${SVNBB_SWIG}" \
--with-berkeley-db=db.h:"${SVNBB_BDB}/include":${SVNBB_BDB}/lib:db \
+ --enable-bdb6 \
--enable-javahl \
--without-jikes \
${lz4config} \
Modified: subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/svncheck.sh
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/svncheck.sh?rev=1844929&r1=1844928&r2=1844929&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/svncheck.sh (original)
+++ subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/svncheck.sh Sat Oct
27 00:12:29 2018
@@ -26,13 +26,18 @@ run_tests() {
case "${ra}" in
local) check=check; skipC=;;
svn) check=svnserveautocheck; skipC="SKIP_C_TESTS=1";;
- dav) check=davautocheck; skipC="SKIP_C_TESTS=1";;
+ dav) check=davautocheck; skipC="SKIP_C_TESTS=1";
+ if [ "${fs}" == "bdb" ]; then
+ mpm="APACHE_MPM=prefork"
+ else
+ mpm="APACHE_MPM=event"
+ fi;;
*) exit 1;;
esac
echo "============ make check ${ra}+${fs}"
cd ${absbld}
- make ${check} FS_TYPE=${fs} PARALLEL=${SVNBB_PARALLEL} CLEANUP=1 ${skipC}
|| ok=false
+ make ${check} FS_TYPE=${fs} PARALLEL=${SVNBB_PARALLEL} CLEANUP=1 ${skipC}
${mpm} || ok=false
# Move any log files to the buildbot work directory
test -f tests.log && mv tests.log
"${abssrc}/.test-logs/tests-${ra}-${fs}.log"
