Author: brane Date: Sat Oct 19 20:53:50 2019 New Revision: 1868637 URL: http://svn.apache.org/viewvc?rev=1868637&view=rev Log: Actually support building and testing with Python 3 on the macOS buildslave.
[in tools/buildbot/slaves/svn-x64-macosx] * svnbuild.sh: For Python 3, activate the virtual environment before configuring, and set the PYTHON environment variable so that configure puts the right path in the Makefile. * svnbuild-bindings.sh: Select which bindings to build and support Python 3. * svncheck.sh, svncheck-bindings.sh: For Python 3, activate the virtual environment before running tests. Modified: subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/svnbuild-bindings.sh subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/svnbuild.sh subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/svncheck-bindings.sh subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/svncheck.sh Modified: subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/svnbuild-bindings.sh URL: http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/svnbuild-bindings.sh?rev=1868637&r1=1868636&r2=1868637&view=diff ============================================================================== --- subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/svnbuild-bindings.sh (original) +++ subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/svnbuild-bindings.sh Sat Oct 19 20:53:50 2019 @@ -24,17 +24,51 @@ scripts=$(cd $(dirname "$0") && pwd) . ${scripts}/setenv.sh +# Parse arguments to find out which bindings we should build +if [ -z "$1" ]; then + use_python3=false + build_swig_py=true + build_swig_pl=true + build_swig_rb=true + build_javahl=true +else + use_python3=false + build_swig_py=false + build_swig_pl=false + build_swig_rb=false + build_javahl=false + + while [ ! -z "$1" ]; do + case "$1" in + python3) use_python3=true;; + swig-py) build_swig_py=true;; + swig-pl) build_swig_pl=true;; + swig-rb) build_swig_rb=true;; + javahl) build_javahl=true;; + *) exit 1;; + esac + shift + done +fi + +${use_python3} \ + && test -n "${SVNBB_PYTHON3ENV}" \ + && . ${SVNBB_PYTHON3ENV}/bin/activate \ + && export PYTHON="$(which python)" + # -# Step 4: build bindings +# Step 1: build bindings # build_bindings() { echo "============ make $1" cd ${absbld} - make $1 + make $1 || exit 1 } -build_bindings swig-py -build_bindings swig-pl -build_bindings swig-rb -build_bindings javahl +${build_swig_py} && build_bindings swig-py +${build_swig_pl} && build_bindings swig-pl +${build_swig_rb} && build_bindings swig-rb +${build_javahl} && build_bindings javahl + +exit 0 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=1868637&r1=1868636&r2=1868637&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 19 20:53:50 2019 @@ -54,6 +54,13 @@ else parallel=${SVNBB_PARALLEL} fi +# An optional parameter tells us if this build should use Python 3. +if [ "$3" = "python3" ]; then + test -n "${SVNBB_PYTHON3ENV}" \ + && . ${SVNBB_PYTHON3ENV}/bin/activate \ + && export PYTHON="$(which python)" +fi + # # Step 0: Create a directory for the test log files # Modified: subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/svncheck-bindings.sh URL: http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/svncheck-bindings.sh?rev=1868637&r1=1868636&r2=1868637&view=diff ============================================================================== --- subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/svncheck-bindings.sh (original) +++ subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/svncheck-bindings.sh Sat Oct 19 20:53:50 2019 @@ -37,6 +37,7 @@ scripts=$(cd $(dirname "$0") && pwd) . ${scripts}/setenv.sh # Parse arguments to find out which tests we should run +use_python3=false check_swig_py=false check_swig_pl=false check_swig_rb=false @@ -44,15 +45,21 @@ check_javahl=false while [ ! -z "$1" ]; do case "$1" in + python3) use_python3=true;; swig-py) check_swig_py=true;; swig-pl) check_swig_pl=true;; swig-rb) check_swig_rb=true;; javahl) check_javahl=true;; - *) exit 1;; + *) exit 1;; esac shift done +${use_python3} \ + && test -n "${SVNBB_PYTHON3ENV}" \ + && . ${SVNBB_PYTHON3ENV}/bin/activate \ + && export PYTHON="$(which python)" + ${check_swig_py} && run_tests swig-py ${check_swig_pl} && run_tests swig-pl ${check_swig_rb} && run_tests swig-rb 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=1868637&r1=1868636&r2=1868637&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 19 20:53:50 2019 @@ -98,7 +98,10 @@ while [ ! -z "$1" ]; do shift done -${use_python3} && test -n "${SVNBB_PYTHON3ENV}" && . ${SVNBB_PYTHON3ENV}/bin/activate +${use_python3} \ + && test -n "${SVNBB_PYTHON3ENV}" \ + && . ${SVNBB_PYTHON3ENV}/bin/activate \ + && export PYTHON="$(which python)" ${check_local} && check_tests local ${check_svn} && check_tests svn