X-Git-Url: http://git.samba.org/?a=blobdiff_plain;f=hape.fns;h=5ddfa25f4f4c044d03c1b88fc397229e79c69c55;hb=dd3f590dd0085e021bed2fed94de32258ef59af7;hp=91c7159be582a84c8a883b577d16afcd02222949;hpb=cc583c0c6e464768475d827013a74fe7fdbf8be3;p=build-farm.git

diff --git a/hape.fns b/hape.fns
index 91c7159b..5ddfa25f 100644
--- a/hape.fns
+++ b/hape.fns
@@ -15,22 +15,21 @@ export MAXTIME TORTURE_MAXTIME SMBD_MAXTIME SAMBA_MAXTIME
 
 #for compiler in gcc cc ; do
 for compiler in gcc ; do
-
-	export config="--with-included-popt"
+	export config=""
 	. common.fns
 
-	# sun_path for unix sockets is char[92]
-	# so we need to use shorter pathes for make test
-	export config="--with-selftest-prefix=/data/home/build/st.samba_4_0_test --with-included-popt"
-	MAKE=gmake test_tree samba_4_0_test source $compiler
+	export config="--bundled-libraries=popt"
+	MAKE=gmake test_tree samba_4_0_test . $compiler
 
 	export config="--with-acl-support --with-libiconv=/usr/local --with-included-popt"
-	test_tree samba_3_current source $compiler
-	export config="--with-acl-support --with-libiconv=/usr/local --with-included-popt"
-	test_tree samba_3_next source $compiler
+	test_tree samba_3_current source3 $compiler
 	export config="--with-acl-support --with-libiconv=/usr/local --with-included-popt"
-	test_tree samba_3_master source $compiler
+	test_tree samba_3_next source3 $compiler
 
 done
 
 global_unlock
+# as long as killbysubdir doesn't work on HP-UX, let's killall our build user's
+# processes:
+cd / ; killall
+