finally worked out what was causing the race condition in the farm -

this fixes it

git-svn-id: file:///home/svn/build-farm/trunk@377 1e5ffdc8-eadd-0310-9daa-9cb4117fe24b

diff --git a/build_test.fns b/build_test.fns
index a71f116d460527158f2736b6a4a101f7827759b9..3d875a43fd114eb530a163f0bc349c6f188d13f5 100644 (file)
--- a/build_test.fns
+++ b/build_test.fns
@@ -316,11 +316,13 @@ test_tree() {
 
        case "$tree" in
            tdb | talloc | ldb | libreplace)
-               builddir="$srcdir/tmpbuild.$compiler"
+               builddir="$test_root/tmp.$tree.$compiler"
+               usingtmpbuild=1
                export builddir
            ;;
            *)
                builddir=$srcdir
+               usingtmpbuild=0
                export builddir
            ;;
        esac
@@ -485,6 +487,9 @@ test_tree() {
                    echo cleaning up
                    do_make clean
                    /bin/rm -rf $prefix
+                   if [ "$usingtmpbuild" = "1" ]; then
+                       /bin/rm -rf $builddir
+                   fi
                fi
                date
        ) > "$log" 2> "$err"