Author: brane
Date: Tue Nov 11 19:33:49 2014
New Revision: 1638316
URL: http://svn.apache.org/r1638316
Log:
Tweak svn-x64-osx scripts to work on older OS versions.
[in tools/buildbot/slaves/svn-x64-macosx]
* mkramdisk.sh: Strip whitespace from teh output of hdiutil.
* setenv.sh: Export the LIBTOOL_CONFIG variable.
Modified:
subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/mkramdisk.sh
subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/setenv.sh
Modified: subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/mkramdisk.sh
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/mkramdisk.sh?rev=1638316&r1=1638315&r2=1638316&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/mkramdisk.sh
(original)
+++ subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/mkramdisk.sh Tue Nov
11 19:33:49 2014
@@ -28,7 +28,9 @@ fi
volume="/Volumes/$1"
mount | fgrep "${volume}" >/dev/null || {
- device=$(hdiutil attach -nomount ram://1200000)
+ # Make sure we strip trailing spaces from the result of older
+ # versions of hduitil.
+ device=$(echo $(hdiutil attach -nomount ram://1200000))
newfs_hfs -M 0700 -v "$1" "${device}"
hdiutil mountvol "${device}"
}
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=1638316&r1=1638315&r2=1638316&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/setenv.sh (original)
+++ subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/setenv.sh Tue Nov 11
19:33:49 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
+## LIBTOOL_CONFIG Optional: libtool configuration path
##
## The invoking script will set local variable named ${scripts} that
## is the absolute path the parent of this file.
@@ -45,6 +46,7 @@ export SVNBB_APR_13_NOTHREAD
export SVNBB_APR_15
export SVNBB_APR_20_DEV
export SVNBB_JUNIT
+export LIBTOOL_CONFIG
# A file named 'ramdisk' containing the uniqe RAM disk volume name
