Commit c88b6b70 authored by Rich Prohaska's avatar Rich Prohaska Committed by Yoni Fogel

#3388 fix the build.check.bash exit code closes[t:3388]

git-svn-id: file:///svn/toku/tokudb@29778 c7de825b-a66e-492c-adef-691d508d4ae1
parent c3bb6b55
...@@ -141,27 +141,16 @@ function build() { ...@@ -141,27 +141,16 @@ function build() {
# checkout the build dir # checkout the build dir
buildbase=$svnbase/tokudb.build buildbase=$svnbase/tokudb.build
if [ ! -d $buildbase ] ; then if [ ! -d $buildbase ] ; then
cd $svnbase mkdir $buildbase
svn checkout -q $svnserver/tokudb.build
cd $buildbase
else
cd $buildbase
svn update -q
svn update -q $date # Could be a sparse directory
fi fi
# make the build directory, possibly on multiple machines simultaneously, there can be only one # make the build directory, possibly on multiple machines simultaneously, there can be only one
builddir=$buildbase/$date builddir=$buildbase/$date
pushd $buildbase pushd $buildbase
while [ ! -d $date ] ; do while [ ! -d $date ] ; do
mkdir -p $date svn mkdir $svnserver/tokudb.build/$date -m ""
svn add $date svn co -q $svnserver/tokudb.build/$date
svn commit $date -m "" if [ $? -ne 0 ] ; then rm -rf $date; fi
if [ $? -eq 0 ] ; then break ; fi
rm -rf $date
svn remove $date
svn update -q
svn update -q $date # Could be a sparse directory
done done
popd popd
...@@ -304,6 +293,8 @@ function build() { ...@@ -304,6 +293,8 @@ function build() {
if [ $deleteafter -eq 1 ] ; then if [ $deleteafter -eq 1 ] ; then
rm -rfv $productbuilddir > /dev/null #windows rm sometimes hangs on giant dirs without -v rm -rfv $productbuilddir > /dev/null #windows rm sometimes hangs on giant dirs without -v
fi fi
return 0
} }
# set defaults # set defaults
...@@ -373,5 +364,6 @@ if [ $revision -eq 0 ] ; then revision=`get_latest_svn_revision`; fi ...@@ -373,5 +364,6 @@ if [ $revision -eq 0 ] ; then revision=`get_latest_svn_revision`; fi
export GCCVERSION=`$CC --version|head -1|cut -f3 -d" "` export GCCVERSION=`$CC --version|head -1|cut -f3 -d" "`
build $bdb build $bdb
exitcode=$?
exit $exitcode exit $exitcode
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment