X-Git-Url: http://git.samba.org/?a=blobdiff_plain;f=generic.fns;h=74e1a677ac1fbcc229a380f0c4030b3f4b79134e;hb=3a207b27f9ca28cb53b8a6d75dc82f401796f837;hp=1c7209c59f9ee0a606d3e0a5a8599a7222773a79;hpb=d71f98ebf12c34151caba58585bb99b1465a48b1;p=build-farm.git

diff --git a/generic.fns b/generic.fns
index 1c7209c5..74e1a677 100644
--- 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"
     }
@@ -41,7 +46,7 @@ for compiler in gcc cc icc; do
 
     TDB_NO_FSYNC=1
     export TDB_NO_FSYNC
-    test_tree samba_4_0_test source4 $compiler
+    test_tree samba_4_0_test . $compiler
     TDB_NO_FSYNC=0
     export TDB_NO_FSYNC
 
@@ -56,9 +61,8 @@ for compiler in gcc cc icc; do
 
       TDB_NO_FSYNC=1
       export TDB_NO_FSYNC
-      test_tree samba_3_current source $compiler
-      test_tree samba_3_next source $compiler
-      test_tree samba_3_master source $compiler
+      test_tree samba_3_current source3 $compiler
+      test_tree samba_3_next source3 $compiler
       TDB_NO_FSYNC=0
       export TDB_NO_FSYNC
 
@@ -68,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