Update my copyright

[build-farm.git] / charis.fns

diff --git a/charis.fns b/charis.fns
index 144fd50af1764f9ed08aa59d436a8e7486bc3a54..f3cad96285baa387137f1a81f83e444a1575adb2 100755 (executable)
--- a/charis.fns
+++ b/charis.fns
@@ -1,4 +1,5 @@
-MAKE="make -j16"
+export MAKE="make"
+export MAKEFLAGS="-j16"
 
 per_run_hook
 
@@ -6,49 +7,9 @@ global_lock
 
 system=`uname`
 
-for compiler in gcc cc icc; do
-
-  ENVCFLAGS=$CFLAGS
-  # arrgh, "which" gives no err code on solaris
-  path=`which $compiler`
-  if [ -x "$path" ]; then
-
-    if $compiler -v 2>&1 | grep gcc.version > /dev/null; then
-       isgcc=1
-       CFLAGS="$ENVCFLAGS -Wall"
-    else
-       isgcc=0
-       CFLAGS="$ENVCFLAGS"
-    fi
-    export CFLAGS
-    if [ $compiler = gcc -o $isgcc = 0 ]; then
-      . common.fns
-      test_tree lorikeet-heimdal . $compiler
-
-      # only attempt samba_4_0_test if we have perl
-      if which perl > /dev/null; then
-        test_tree samba_4_0_test source $compiler
-      fi
-
-      # only attempt samba-gtk if we have perl and gtk+-2.0
-      if which perl > /dev/null && which pkg-config > /dev/null && pkg-config --exists gtk+-2.0; then
-        test_tree samba-gtk . $compiler
-      fi
-
-      test_tree samba_3_X_test source $compiler
-      test_tree samba_3_X_devel source $compiler
-
-      # by default build ppp only on SunOS or Linux systems
-      if [ "$system" = Linux -o "$system" = SunOS ]; then
-         test_tree ppp . $compiler
-      fi
-    fi
-  fi
-done
-
-# only attempt pidl if we have perl
-if which perl > /dev/null; then
-  test_tree pidl . cc build test
-fi
+compiler=gcc
+test_tree samba_4_0_test . gcc
+export config="--enable-merged-build"
+test_tree samba_3_master source3 gcc
 
 global_unlock