From 7544f3574168d4a41857550628e4391392e39f5b Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 30 Jun 2017 11:15:40 +1200 Subject: [PATCH] autobuild: Run nt4_dc and nt4_member tests in parallel These do not interact with the main AD DC environments, so can run in parallel Signed-off-by: Andrew Bartlett Reviewed-by: Gary Lockyer --- script/autobuild.py | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/script/autobuild.py b/script/autobuild.py index 699fb41df1f..7712d10ddfc 100755 --- a/script/autobuild.py +++ b/script/autobuild.py @@ -26,6 +26,7 @@ cleanup_list = [] builddirs = { "ctdb" : "ctdb", "samba" : ".", + "samba-nt4" : ".", "samba-xc" : ".", "samba-o3" : ".", "samba-ctdb" : ".", @@ -48,6 +49,7 @@ builddirs = { defaulttasks = [ "ctdb", "samba", + "samba-nt4", "samba-xc", "samba-o3", "samba-ctdb", @@ -90,16 +92,25 @@ tasks = { ("check-clean-tree", "../script/clean-source-tree.sh", "text/plain"), ("clean", "make clean", "text/plain") ], - # We have 'test' before 'install' because, 'test' should work without 'install' + # We have 'test' before 'install' because, 'test' should work without 'install (runs ad_dc_ntvfs and all the other envs)' "samba" : [ ("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='--exclude-env=none'", - "text/plain"), + "TESTS='--exclude-env=none " + "--exclude-env=nt4_dc " + "--exclude-env=nt4_member'", "text/plain"), ("install", "make install", "text/plain"), ("check-clean-tree", "script/clean-source-tree.sh", "text/plain"), ("clean", "make clean", "text/plain") ], + # We split out this so the isolated nt4_dc tests do not wait for ad_dc or ad_dc_ntvfs tests (which are long) + "samba-nt4" : [ ("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=nt4_dc --include-env=nt4_member'", "text/plain"), + ("install", "make install", "text/plain"), + ("check-clean-tree", "script/clean-source-tree.sh", "text/plain"), + ("clean", "make clean", "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") ],