Skip to content
This repository has been archived by the owner on Jan 7, 2020. It is now read-only.

Commit

Permalink
Support testing with Python 3 in the OS X buildslave.
Browse files Browse the repository at this point in the history
* tools/buildbot/slaves/svn-x64-macosx/setenv.sh
  (SVNBB_PYTHON3ENV): New environment variable.
* tools/buildbot/slaves/svn-x64-macosx/svncheck.sh:
   Activate a Python 3 virtualenv when given the 'pythoh3' argument.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1809586 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
brainy committed Sep 25, 2017
1 parent 8dc8812 commit be6d335
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
2 changes: 2 additions & 0 deletions tools/buildbot/slaves/svn-x64-macosx/setenv.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
## SVNBB_APR_20_DEV Path of APR-2.0
## SVNBB_JUNIT The path of the junit.jar
## SVNBB_PARALLEL Optional: parallelization; defaults to 2
## SVNBB_PYTHON3ENV Optional: Python 3 virtual environment
##
## The invoking script will set local variable named ${scripts} that
## is the absolute path the parent of this file.
Expand All @@ -48,6 +49,7 @@ export SVNBB_APR_15
export SVNBB_APR_20_DEV
export SVNBB_JUNIT
export SVNBB_PARALLEL
export SVNBB_PYTHON3ENV


# Set the absolute source path
Expand Down
4 changes: 4 additions & 0 deletions tools/buildbot/slaves/svn-x64-macosx/svncheck.sh
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ scripts=$(cd $(dirname "$0") && pwd)
. ${scripts}/setenv.sh

# Parse arguments to find out which tests we should run
use_python3=false
check_local=false
check_svn=false
check_dav=false
Expand All @@ -74,6 +75,7 @@ check_bdb=false

while [ ! -z "$1" ]; do
case "$1" in
python3) use_python3=true;;
local) check_local=true;;
svn) check_svn=true;;
dav) check_dav=true;;
Expand All @@ -87,6 +89,8 @@ while [ ! -z "$1" ]; do
shift
done

${use_python3} && test -n "${SVNBB_PYTHON3ENV}" && . ${SVNBB_PYTHON3ENV}/bin/activate

${check_local} && check_tests local
${check_svn} && check_tests svn
${check_dav} && check_tests dav
Expand Down

0 comments on commit be6d335

Please sign in to comment.