You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2015/09/01 19:36:42 UTC
svn commit: r1700626 - in
/subversion/trunk/tools/buildbot/slaves/svn-x64-macosx: setenv.sh
svnbuild-bindings.sh svnbuild.sh svncheck-bindings.sh svncheck.sh svnclean.sh
Author: brane
Date: Tue Sep 1 17:36:41 2015
New Revision: 1700626
URL: http://svn.apache.org/r1700626
Log:
Move the expected location of the svn-x64-macosx buildbot scripts
into a subdirectory, to allow for running other builders on the
same buildslave.
* tools/buildbot/slaves/svn-x64-macosx/setenv.sh
(environment): Skip another directory level.
* tools/buildbot/slaves/svn-x64-macosx/svnclean.sh,
tools/buildbot/slaves/svn-x64-macosx/svnbuild.sh,
tools/buildbot/slaves/svn-x64-macosx/svnbuild-bindings.sh,
tools/buildbot/slaves/svn-x64-macosx/svncheck.sh,
tools/buildbot/slaves/svn-x64-macosx/svncheck-bindings.sh
(scripts): Descend into the .../svnbot directory.
Modified:
subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/setenv.sh
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
subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/svnclean.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=1700626&r1=1700625&r2=1700626&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/setenv.sh (original)
+++ subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/setenv.sh Tue Sep 1 17:36:41 2015
@@ -36,7 +36,7 @@
## is the absolute path the parent of this file.
# Modify this to suit your deployment
-environment=$(cd "${scripts}/.." && pwd)/environment.sh
+environment=$(cd "${scripts}/../.." && pwd)/environment.sh
eval $(${environment})
SVNBB_PARALLEL="${SVNBB_PARALLEL-2}"
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=1700626&r1=1700625&r2=1700626&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 Tue Sep 1 17:36:41 2015
@@ -20,7 +20,7 @@
set -e
set -x
-scripts=$(cd $(dirname "$0") && pwd)
+scripts=$(cd $(dirname "$0") && pwd)/svnbot
. ${scripts}/setenv.sh
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=1700626&r1=1700625&r2=1700626&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/svnbuild.sh (original)
+++ subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/svnbuild.sh Tue Sep 1 17:36:41 2015
@@ -20,7 +20,7 @@
set -e
set -x
-scripts=$(cd $(dirname "$0") && pwd)
+scripts=$(cd $(dirname "$0") && pwd)/svnbot
. ${scripts}/setenv.sh
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=1700626&r1=1700625&r2=1700626&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 Tue Sep 1 17:36:41 2015
@@ -30,7 +30,7 @@ run_tests() {
set -x
-scripts=$(cd $(dirname "$0") && pwd)
+scripts=$(cd $(dirname "$0") && pwd)/svnbot
. ${scripts}/setenv.sh
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=1700626&r1=1700625&r2=1700626&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/svncheck.sh (original)
+++ subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/svncheck.sh Tue Sep 1 17:36:41 2015
@@ -58,7 +58,7 @@ check_tests() {
set -x
-scripts=$(cd $(dirname "$0") && pwd)
+scripts=$(cd $(dirname "$0") && pwd)/svnbot
. ${scripts}/setenv.sh
Modified: subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/svnclean.sh
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/svnclean.sh?rev=1700626&r1=1700625&r2=1700626&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/svnclean.sh (original)
+++ subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/svnclean.sh Tue Sep 1 17:36:41 2015
@@ -20,7 +20,7 @@
set -e
set -x
-scripts=$(cd $(dirname "$0") && pwd)
+scripts=$(cd $(dirname "$0") && pwd)/svnbot
. ${scripts}/setenv.sh