Update the trees currently used by the build farm to build samba.

[build-farm.git] / generic.fns

diff --git a/generic.fns b/generic.fns
index 300076b973894bdfab171b7e46d17fe9eaee1d57..97937a7afb0f61512f25247b2f7a35c341b0f606 100644 (file)
--- a/generic.fns
+++ b/generic.fns
@@ -8,15 +8,20 @@ ENVCFLAGS=$CFLAGS
 cur_compiler_sum=""
 last_compiler_sum=""
 
-for compiler in gcc cc icc; do
+if [ "x$compilers" = "x" ]; then
+       compilers="gcc cc icc"
+fi
+
+for compiler in $compilers; do
 
+  echo "working with compiler $compiler"
   # arrgh, "which" gives no err code on solaris
   path=`which $compiler`
   if [ -x "$path" ]; then
 
     # We do not want to build with the same compiler twice
     # cc is a symlink to gcc on some systems
-    cur_compiler_sum="`sum $path`"
+    cur_compiler_sum="`sum $path | sed 's/ .*//'`"
     test x"$cur_compiler_sum" = x"" && {
        cur_compiler_sum="$path"
     }
@@ -27,10 +32,10 @@ for compiler in gcc cc icc; do
 
     if $compiler -v 2>&1 | grep gcc.version > /dev/null; then
        isgcc=1
-       CFLAGS="$ENVCFLAGS -Wall"
+       CFLAGS="$ENVCFLAGS -Wall -g"
     else
        isgcc=0
-       CFLAGS="$ENVCFLAGS"
+       CFLAGS="$ENVCFLAGS -g"
     fi
 
     CFLAGS_THIS_COMPILER=`eval CFLAGS_$compiler 2>/dev/null`
@@ -41,7 +46,6 @@ for compiler in gcc cc icc; do
 
     TDB_NO_FSYNC=1
     export TDB_NO_FSYNC
-    test_tree samba_4_0_test source4 $compiler
     TDB_NO_FSYNC=0
     export TDB_NO_FSYNC
 
@@ -54,9 +58,13 @@ for compiler in gcc cc icc; do
         test_tree samba-gtk . $compiler
       fi
 
-      test_tree samba_3_current source $compiler
-      test_tree samba_3_next source $compiler
-      test_tree samba_3_master source $compiler
+      TDB_NO_FSYNC=1
+      export TDB_NO_FSYNC
+      test_tree samba_current . $compiler
+      test_tree samba_next . $compiler
+      test_tree samba_master . $compiler
+      TDB_NO_FSYNC=0
+      export TDB_NO_FSYNC
 
       # by default build ppp only on SunOS or Linux systems
       if [ "$system" = Linux -o "$system" = SunOS ]; then
@@ -64,11 +72,12 @@ for compiler in gcc cc icc; do
       fi
     fi
   fi
-done
 
-# only attempt pidl if we have perl
-if which perl > /dev/null; then
-  test_tree pidl . cc
-fi
+  # only attempt pidl if we have perl
+  if which perl > /dev/null; then
+    test_tree pidl . cc
+  fi
+
+done
 
 global_unlock