X-Git-Url: http://git.samba.org/?a=blobdiff_plain;f=build_test;h=da5088ecd998884b07c80d4cd13ad35b742af390;hb=89762541cf479b8656040daf78127255b529c4d7;hp=c4cdaae53b574b0112490ab8fcf01a3c4ecd01d5;hpb=c81fe21ca73ed3ae7ab469044bdc14d86e9b6436;p=build-farm.git

diff --git a/build_test b/build_test
index c4cdaae5..da5088ec 100755
--- a/build_test
+++ b/build_test
@@ -1,20 +1,35 @@
-#!/bin/bash
+#!/bin/sh
 # this is the main build script for build.samba.org
 # it gets run on all the build boxes via cron
 
 # any errors get put in build.log
 
 # we used a fixed path that is a superset of the required paths.
-export PATH=~/bin:/usr/local/bin:/usr/bin:/bin:/opt/SUNWspro/bin:/usr/ccs/bin:/sbin:/usr/sbin:/usr/local/sbin:/usr/bsd
+build_test_path=.:$HOME/bin:/usr/local/bin:/usr/bin:/bin:/opt/SUNWspro/bin:/usr/pkg/bin:/usr/pkg/sbin:/usr/ccs/bin:/sbin:/usr/sbin:/usr/local/sbin:/usr/bsd
+PATH=$build_test_path
+export PATH
+CFLAGS=""
+export CFLAGS
+
+build_test_id='$Id$'
 
 # go to our main directory
-cd ~/build_farm || exit 1
+cd $HOME/build_farm || exit 1
 
 (
 
     echo
     date
 
+    #
+    # allow admins to configure things like
+    # PATH, RSYNC_PROXY, ...
+    #
+    if [ -f build_test.settings.local ]; then
+        build_test_settings_local_file="build_test.settings.local"
+        . $build_test_settings_local_file
+    fi
+
     # we only want the short name of the host - use cut for portability
     host=`hostname | cut -d. -f1`
 
@@ -22,16 +37,28 @@ cd ~/build_farm || exit 1
     chmod 600 .password
 
     # grab the latest versions of the scripts
-    rsync --timeout=200 -q -az samba.org::build_farm/*.fns .
+    rsync --delete --include='*.fns' --exclude='*' --timeout=200 -q -az build.samba.org::build_farm/ .
 
     # load general functions
     . build_test.fns
 
+    #
+    # allow admins to overload things like send_logs()
+    # if it's required to have secret data in it,
+    # that can't be in a per host .fns file on
+    # the build-farm svn tree
+    #
+    if [ -f build_test.fns.local ]; then
+        build_test_fns_local_file="build_test.fns.local"
+        . $build_test_fns_local_file
+    fi
+
     if [ -f $host.fns ]; then
       # load host specific functions
-      . $host.fns
+      build_test_used_fns_file="$host.fns"
     else
-      . generic.fns
+      build_test_used_fns_file="generic.fns"
     fi
+    . $build_test_used_fns_file
 
 ) >> build.log 2>&1