diff options
Diffstat (limited to 'tools/buildbot/slaves/svn-x64-macosx')
5 files changed, 52 insertions, 25 deletions
diff --git a/tools/buildbot/slaves/svn-x64-macosx/setenv.sh b/tools/buildbot/slaves/svn-x64-macosx/setenv.sh index d4130e1..f36ba2d 100644 --- a/tools/buildbot/slaves/svn-x64-macosx/setenv.sh +++ b/tools/buildbot/slaves/svn-x64-macosx/setenv.sh @@ -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 diff --git a/tools/buildbot/slaves/svn-x64-macosx/svnbuild-bindings.sh b/tools/buildbot/slaves/svn-x64-macosx/svnbuild-bindings.sh index fa085dd..284f320 100755 --- a/tools/buildbot/slaves/svn-x64-macosx/svnbuild-bindings.sh +++ b/tools/buildbot/slaves/svn-x64-macosx/svnbuild-bindings.sh @@ -25,21 +25,16 @@ scripts=$(cd $(dirname "$0") && pwd) . ${scripts}/setenv.sh # -# Step 4: build swig-py +# Step 4: build bindings # -echo "============ make swig-py" -cd ${absbld} -make swig-py +build_bindings() { + echo "============ make $1" + cd ${absbld} + make $1 +} -echo "============ make swig-pl" -cd ${absbld} -make swig-pl - -echo "============ make swig-rb" -cd ${absbld} -make swig-rb - -echo "============ make javahl" -cd ${absbld} -make javahl +build_bindings swig-py +build_bindings swig-pl +build_bindings swig-rb +build_bindings javahl diff --git a/tools/buildbot/slaves/svn-x64-macosx/svnbuild.sh b/tools/buildbot/slaves/svn-x64-macosx/svnbuild.sh index eff8986..8d70769 100755 --- a/tools/buildbot/slaves/svn-x64-macosx/svnbuild.sh +++ b/tools/buildbot/slaves/svn-x64-macosx/svnbuild.sh @@ -27,17 +27,33 @@ 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}" serfconfig=" --without-serf --without-apxs" fi +# An optional parameter tells us if this is a warnings-only build. +# We run the warnings build with a number of additional options. +if [ "$2" = "warnings" ]; then + parallel=1 + maintainer_mode=' -q --enable-maintainer-mode' + config_cflags="-Wno-deprecated-declarations" + config_cflags="${config_cflags} -DPACK_AFTER_EVERY_COMMIT" + config_cflags="${config_cflags} -DSVN_UNALIGNED_ACCESS_IS_OK=0" + config_cflags="${config_cflags} -DSUFFIX_LINES_TO_KEEP=0" + config_cflags="${config_cflags} -DSVN_DEPRECATED=" +else + parallel=${SVNBB_PARALLEL} +fi + # # Step 0: Create a directory for the test log files # @@ -82,8 +98,10 @@ fi echo "============ configure" cd ${absbld} -env CC=clang CXX=clang++ \ -${abssrc}/configure \ +env CC=clang CFLAGS="${config_cflags}" \ + CXX=clang++ CXXFLAGS="${config_cxxflags}" \ + LDFLAGS='-Wl,-w' \ +${abssrc}/configure${maintainer_mode} \ --prefix="${absbld}/.install-prefix" \ --enable-debug${optimizeconfig} \ --disable-nls \ @@ -91,6 +109,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} \ @@ -105,4 +124,4 @@ test -f config.log && mv config.log "${abssrc}/.test-logs/config.log" echo "============ make" cd ${absbld} -make -j${SVNBB_PARALLEL} +make -j${parallel} diff --git a/tools/buildbot/slaves/svn-x64-macosx/svncheck-bindings.sh b/tools/buildbot/slaves/svn-x64-macosx/svncheck-bindings.sh index 1fb538b..4810408 100755 --- a/tools/buildbot/slaves/svn-x64-macosx/svncheck-bindings.sh +++ b/tools/buildbot/slaves/svn-x64-macosx/svncheck-bindings.sh @@ -24,6 +24,8 @@ run_tests() { echo "============ make check-${check}" cd ${absbld} + make -s install + make -s install-${check} make check-${check} ${cleanup} || exit 1 } diff --git a/tools/buildbot/slaves/svn-x64-macosx/svncheck.sh b/tools/buildbot/slaves/svn-x64-macosx/svncheck.sh index 0d24286..9465d3f 100755 --- a/tools/buildbot/slaves/svn-x64-macosx/svncheck.sh +++ b/tools/buildbot/slaves/svn-x64-macosx/svncheck.sh @@ -24,15 +24,22 @@ run_tests() { ok=true case "${ra}" in - local) check=check; skipC=;; - svn) check=svnserveautocheck; skipC="SKIP_C_TESTS=1";; - dav) check=davautocheck; skipC="SKIP_C_TESTS=1";; + local) check=check; more=;; + svn) check=svnserveautocheck; more="SKIP_C_TESTS=1";; + dav) check=davautocheck; more="SKIP_C_TESTS=1"; + if [ "${fs}" == "bdb" ]; then + more="${more} APACHE_MPM=prefork" + else + more="${more} APACHE_MPM=event" + fi;; *) exit 1;; esac + ${allow_remote} && more="${more} ALLOW_REMOTE_HTTP_CONNECTION=1" + 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 ${more} || 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" @@ -72,6 +79,7 @@ check_fsfs_v6=false check_fsfs_v4=false check_fsx=false check_bdb=false +allow_remote=false while [ ! -z "$1" ]; do case "$1" in @@ -84,6 +92,7 @@ while [ ! -z "$1" ]; do fsfs-v4) check_fsfs_v4=true;; fsx) check_fsx=true;; bdb) check_bdb=true;; + remote) allow_remote=true;; *) exit 1;; esac shift |