From 56191dcfb783913742a373671901def7db28e842 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 21 Mar 2018 07:02:42 +1300 Subject: autobuild: Split up the build further with samba-ad-dc-2 Signed-off-by: Andrew Bartlett Reviewed-by: Gary Lockyer --- script/autobuild.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'script') diff --git a/script/autobuild.py b/script/autobuild.py index 6e8abe77479..0a54723c7a5 100755 --- a/script/autobuild.py +++ b/script/autobuild.py @@ -36,6 +36,7 @@ builddirs = { "samba-test-only" : ".", "samba-none-env" : ".", "samba-ad-dc" : ".", + "samba-ad-dc-2" : ".", "samba-systemkrb5" : ".", "samba-nopython" : ".", "ldb" : "lib/ldb", @@ -60,6 +61,7 @@ defaulttasks = [ "ctdb", "samba-static", "samba-none-env", "samba-ad-dc", + "samba-ad-dc-2", "samba-systemkrb5", "samba-nopython", "ldb", @@ -104,6 +106,9 @@ tasks = { "--exclude-env=nt4_dc " "--exclude-env=nt4_member " "--exclude-env=ad_dc " + "--exclude-env=chgdcpass " + "--exclude-env=vampire_2000_dc " + "--exclude-env=fl2000dc " "--exclude-env=fileserver'", "text/plain"), ("install", "make install", "text/plain"), @@ -132,6 +137,13 @@ tasks = { ("test", "make test FAIL_IMMEDIATELY=1 TESTS='--include-env=ad_dc'", "text/plain"), ("check-clean-tree", "script/clean-source-tree.sh", "text/plain")], + # We split out this so the isolated ad_dc tests do not wait for ad_dc_ntvfs tests (which are long) + "samba-ad-dc-2" : [ ("random-sleep", "../script/random-sleep.sh 60 600", "text/plain"), + ("configure", "./configure.developer --with-selftest-prefix=./bin/ab" + samba_configure_params, "text/plain"), + ("make", "make -j", "text/plain"), + ("test", "make test FAIL_IMMEDIATELY=1 TESTS='--include-env=chgdcpass --include-env=vampire_2000_dc --include-env=fl2000dc'", "text/plain"), + ("check-clean-tree", "script/clean-source-tree.sh", "text/plain")], + "samba-test-only" : [ ("configure", "./configure.developer --with-selftest-prefix=./bin/ab --abi-check-disable" + samba_configure_params, "text/plain"), ("make", "make -j", "text/plain"), ("test", 'make test FAIL_IMMEDIATELY=1 TESTS="${TESTS}"',"text/plain") ], -- cgit v1.2.1