remove .fns file for removed host burns

[build-farm.git] / build_test.fns

diff --git a/build_test.fns b/build_test.fns
index 400b80210f2785c4ccf40e0972aae16709455a68..de2023e31376474514f0ace61135f7782a6f2afa 100644 (file)
--- a/build_test.fns
+++ b/build_test.fns
@@ -320,9 +320,6 @@ action_lcovreport() {
                lorikeet-heimdal*)
                        lcov --directory $builddir --capture --output-file $builddir/$tree.lcov.info
                        ;;
-               samba_3_master*)
-                       lcov --base-directory $builddir --directory $builddir/.. --capture --output-file $builddir/$tree.lcov.info
-                       ;;
                samba_4*|tdb*|talloc|ldb|libreplace)
                        lcov --base-directory $builddir/bin --directory $builddir/bin --capture --output-file $builddir/$tree.lcov.info
                        ;;
@@ -349,7 +346,7 @@ action_callcatcherreport() {
                tdb*|talloc|ldb)
                        callanalyse `find $builddir/bin -name \*.so*` $builddir/bin/* > $builddir/coverage/unused-fns.txt
                        ;;
-               samba_3_master|samba_4*)
+               samba_4*)
                        callanalyse `find $builddir/bin -name \*.so*` $builddir/bin/* > $builddir/coverage/all-unused-fns.txt 
                        grep -v -f $srcdir/callcatcher-exceptions.grep $builddir/coverage/all-unused-fns.txt > $builddir/coverage/unused-fns.txt
                        ;;
@@ -579,6 +576,14 @@ action_test() {
        esac
 }
 
+#############################
+# Do nothing (needed if we have nothing to do for extra_actions)
+#############################
+
+action_none() {
+    return 0;
+}
+
 ###########################
 # do a test build of a particular tree
 # This is the master function called by generic.fns or
@@ -748,9 +753,6 @@ test_tree() {
        samba_4*)
                sw_config="$config --enable-selftest"
                ;;
-       samba_3_master)
-               sw_config="$config --enable-selftest"
-               ;;
        samba_3*)
                sw_config="$config --enable-socket-wrapper"
                sw_config="$sw_config --enable-nss-wrapper"
@@ -806,7 +808,7 @@ test_tree() {
        fi
 
        if [ "$extra_actions" = "" ]; then
-               actions="none"
+               extra_actions="none"
        fi
 
        # start the build
@@ -1044,7 +1046,7 @@ per_run_hook() {
 
        old_trees="web popt distcc samba-gtk smb-build lorikeet-heimdal samba_3_2"
        old_trees="$old_tree samba_3_2_test samba4 samba_4_0_waf samba_4_0_waf.metze"
-       old_trees="$old_tree samba_3_X_test samba_3_X_devel samba_3_X_devel samba_3_waf"
+       old_trees="$old_tree samba_3_X_test samba_3_X_devel samba_3_X_devel samba_3_waf samba_3_master"
        for d in $old_trees; do
                delete_old_tree $d
        done