now that samba_3_waf is just a regular part of the build, remove seperate tree

[amitay/build-farm.git] / SerNet-solaris8.fns

diff --git a/SerNet-solaris8.fns b/SerNet-solaris8.fns
index e7098d4b30711569c4cc93e28251011742651f34..66464f4c25a1633b53b8f24e907f17e6bc8cf334 100644 (file)
--- a/SerNet-solaris8.fns
+++ b/SerNet-solaris8.fns
@@ -2,29 +2,44 @@ per_run_hook
 
 global_lock
 
-MAXTIME=36000
+MAXTIME=42200
 TORTURE_MAXTIME=3600
-SMBD_MAXTIME=18000
-SAMBA_MAXTIME=18000
-export MAXTIME TORTURE_MAXTIME SMBD_MAXTIME SAMBA_MAXTIME
-
-for compiler in cc ; do
+SMBD_MAXTIME=42200
+SAMBA_MAXTIME=42200
+
+# this is needed because python depends on openssl for some modules like hashlib
+# that in turn samba pretty much depends on
+# We need also /usr/local/lib for gcc as it needs libgcc_s.(so|a)
+
+LD_LIBRARY_PATH=/usr/local/ssl/lib:/usr/local/lib
+export MAXTIME TORTURE_MAXTIME SMBD_MAXTIME SAMBA_MAXTIME LD_LIBRARY_PATH
+PREHOOKS="configure"
+
+prehook_configure()
+{
+case "$tree" in
+       samba_4*)
+               ;;
+       *)
+               ;;
+esac
+}
+
+CFLAGS="-g $CFLAGS"
+export CFLAGS
+compilers="cc gcc"
+
+for compiler in $compilers; do
        #export config="--with-included-popt"
        . common.fns
-
-       test_tree samba_4_0_test source $compiler
-
-       # this is a strange one. SerNet-solaris8 has two copies
-       # of iconv, one in /usr and the other in /usr/local
-       # it also has the python libs, but only in /usr/local
-       # we need to ensure it doesn't find python in /usr/local
-       # and iconv from /usr, otherwise the -I flags will conflict
-       CFLAGS="-I/usr/local/include" test_tree samba_4_0_waf source4 $compiler
-
-       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_4_0_test . $compiler
+       test_tree samba_3_current source3 $compiler
+       test_tree samba_3_next source3 $compiler
+       test_tree samba_3_master source3 $compiler
+       TDB_NO_FSYNC=0
+       export TDB_NO_FSYNC
 done
 
 global_unlock