Author: hwright
Date: Fri Jul 1 19:08:45 2011
New Revision: 1142028
URL: http://svn.apache.org/viewvc?rev=1142028&view=rev
Log:
Update a couple of scripts on the Ubuntu buildslave. This makes use of the
generic /dev/shm ramdisk, rather than creating a special one for the bot.
[ in subversion/trunk/tools/buildbot/slaves/ubuntu-x64 ]
* svnclean.sh:
Don't cleanup the ramdisk.
* mount-ramdrive.c:
Remove.
* svncheck.sh:
Don't mount a special ramdisk, just use a symlink to /dev/shm.
* unmount-ramdrive.c:
Remove.
Removed:
subversion/trunk/tools/buildbot/slaves/ubuntu-x64/mount-ramdrive.c
subversion/trunk/tools/buildbot/slaves/ubuntu-x64/unmount-ramdrive.c
Modified:
subversion/trunk/tools/buildbot/slaves/ubuntu-x64/svncheck.sh
subversion/trunk/tools/buildbot/slaves/ubuntu-x64/svnclean.sh
Modified: subversion/trunk/tools/buildbot/slaves/ubuntu-x64/svncheck.sh
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/slaves/ubuntu-x64/svncheck.sh?rev=1142028&r1=1142027&r2=1142028&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/ubuntu-x64/svncheck.sh (original)
+++ subversion/trunk/tools/buildbot/slaves/ubuntu-x64/svncheck.sh Fri Jul 1
19:08:45 2011
@@ -29,9 +29,9 @@ if test -z "$1" ; then
fi
echo "========= mount RAM disc"
-# ignore the result: if it fails, the test will just take longer...
-mkdir -p subversion/tests/cmdline/svn-test-work
-test -e ../mount-ramdrive && ../mount-ramdrive
+test ! -e /dev/shm/svn-test-work && mkdir /dev/shm/svn-test-work
+test -e subversion/tests/cmdline/svn-test-work && rm -rf
subversion/tests/cmdline/svn-test-work
+ln -s /dev/shm/svn-test-work subversion/tests/cmdline/
echo "========= make check"
make check FS_TYPE=$1 CLEANUP=1 || exit $?
Modified: subversion/trunk/tools/buildbot/slaves/ubuntu-x64/svnclean.sh
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/slaves/ubuntu-x64/svnclean.sh?rev=1142028&r1=1142027&r2=1142028&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/ubuntu-x64/svnclean.sh (original)
+++ subversion/trunk/tools/buildbot/slaves/ubuntu-x64/svnclean.sh Fri Jul 1
19:08:45 2011
@@ -22,10 +22,6 @@
set -x
-echo "========= unmount RAM disc"
-# ignore the result: if there was no ramdisc, that's fine
-test -e ../unmount-ramdrive && ../unmount-ramdrive
-
echo "========= make extraclean"
cd build
test -e Makefile && (make extraclean || exit $?)
