Author: brane
Date: Wed Nov 12 11:53:55 2014
New Revision: 1638767
URL: http://svn.apache.org/r1638767
Log:
Parametrize parallelization level on the OSX buildbot.
[in tools/buildbot/slaves/svn-x64-macosx]
* setenv.sh: Set a new parameter, SVNBB_PARALLEL.
* svnbuild.sh, svncheck.sh: Use this parameter in the 'make'
and 'make check' command lines.
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=1638767&r1=1638766&r2=1638767&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/setenv.sh (original)
+++ subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/setenv.sh Wed Nov 12
11:53:55 2014
@@ -29,6 +29,7 @@
## 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
## LIBTOOL_CONFIG Optional: libtool configuration path
##
## The invoking script will set local variable named ${scripts} that
@@ -38,6 +39,8 @@
environment=$(cd "${scripts}/.." && pwd)/environment.sh
eval $(${environment})
+SVNBB_PARALLEL="${SVNBB_PARALLEL-2}"
+
export PATH
export SVNBB_BDB
export SVNBB_SWIG
@@ -46,27 +49,19 @@ export SVNBB_APR_13_NOTHREAD
export SVNBB_APR_15
export SVNBB_APR_20_DEV
export SVNBB_JUNIT
+export SVNBB_PARALLEL
export LIBTOOL_CONFIG
-# A file named 'ramdisk' containing the uniqe RAM disk volume name
-# used by the build slave must be present in the same directory as the
-# scripts.
-
-if [ ! -f "${scripts}/ramdisk" ]; then
- echo "Missing config file: ${scripts}/ramdisk"
- exit 1
-fi
+# Set the absolute source path
+abssrc=$(pwd)
-# Set the name of the RAMdisk volume
-volume_name=$(head -1 "${scripts}/ramdisk")
+# The RAMdisk volume name is the same as the name of the builder
+volume_name=$(basename $(dirname "${abssrc}"))
if [ -z "${volume_name}" ]; then
echo "Missing config parameter: RAMdisk volume name"
exit 1
fi
-# Set the absolute source path
-abssrc=$(pwd)
-
# Set the absolute build path
absbld="/Volumes/${volume_name}"
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=1638767&r1=1638766&r2=1638767&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/svnbuild.sh (original)
+++ subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/svnbuild.sh Wed Nov
12 11:53:55 2014
@@ -51,7 +51,7 @@ rm -fr sqlite-amalgamation
# Step 2: Regenerate build scripts
#
-echo "\n============ autogen.sh\n"
+echo "============ autogen.sh"
cd ${abssrc}
./autogen.sh
@@ -81,4 +81,4 @@ ${abssrc}/configure \
echo "============ make"
cd ${absbld}
-make -j4
+make -j${SVNBB_PARALLEL}
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=1638767&r1=1638766&r2=1638767&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/svncheck.sh (original)
+++ subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/svncheck.sh Wed Nov
12 11:53:55 2014
@@ -31,7 +31,7 @@ run_tests() {
echo "============ make check ${ra}+${fs}"
cd ${absbld}
- make ${check} FS_TYPE=${fs} PARALLEL=2 CLEANUP=1 ${skipC}
+ make ${check} FS_TYPE=${fs} PARALLEL=${SVNBB_PARALLEL} CLEANUP=1 ${skipC}
# The tests.log file must exist
test -f tests.log || exit 1
