python-2.6 devel libraries installed on tridge (ppc64 box)

[build-farm.git] / build_test.fns

diff --git a/build_test.fns b/build_test.fns
index 7156f81feab74bdad313919329766c12d8314c84..b5ab052e180164e4d010fbccebd1bbc5af297fea 100644 (file)
--- a/build_test.fns
+++ b/build_test.fns
@@ -345,7 +345,7 @@ action_lcovreport() {
 ############################
 
 action_configure() {
-
+        # special handling for some trees
        case "$tree" in
            waf*)
                $builddir/timelimit $MAXTIME ./waf configure
@@ -417,7 +417,7 @@ action_config_log() {
 ############################
 
 action_config_header() {
-       hdr_files="config.h include/config.h bin/default/config.h bin/default/source4/include/config.h bin/default/source3/include/config.h"
+       hdr_files="config.h include/config.h include/autoconf/config.h bin/default/config.h bin/default/include/config.h bin/default/source3/include/config.h"
        for h in $hdr_files; do
                if [ -f $h ]; then
                        echo "contents of $h:"
@@ -446,6 +446,7 @@ action_build() {
                ;;
        waf*)
                do_make build
+               bstatus=$?
                ;;
        *)
                do_make all
@@ -955,7 +956,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"
+       old_trees="$old_tree samba_3_X_test samba_3_X_devel samba_3_X_devel samba_3_waf"
        for d in $old_trees; do
                delete_old_tree $d
        done