From d47fb2232bdbbc401d59b86d2641078c6e7bfdc6 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 30 Jun 2017 11:13:55 +1200 Subject: autobuild: Run all "ad_dc" environment tests in samba-ad-dc This allows us not to run ad_dc tests in the main build, making the autobuild process faster. The ad_dc tests run in less than 50mins on travis-ci, which allows this part of the tests to be run. Signed-off-by: Andrew Bartlett Reviewed-by: Gary Lockyer --- script/autobuild.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'script') diff --git a/script/autobuild.py b/script/autobuild.py index 7712d10ddfc..0294afaae3e 100755 --- a/script/autobuild.py +++ b/script/autobuild.py @@ -34,6 +34,7 @@ builddirs = { "samba-static" : ".", "samba-test-only" : ".", "samba-none-env" : ".", + "samba-ad-dc" : ".", "samba-systemkrb5" : ".", "samba-nopython" : ".", "ldb" : "lib/ldb", @@ -56,6 +57,7 @@ defaulttasks = [ "ctdb", "samba-libs", "samba-static", "samba-none-env", + "samba-ad-dc", "samba-systemkrb5", "samba-nopython", "ldb", @@ -98,7 +100,8 @@ tasks = { ("test", "make test FAIL_IMMEDIATELY=1 " "TESTS='--exclude-env=none " "--exclude-env=nt4_dc " - "--exclude-env=nt4_member'", "text/plain"), + "--exclude-env=nt4_member " + "--exclude-env=ad_dc ", "text/plain"), ("install", "make install", "text/plain"), ("check-clean-tree", "script/clean-source-tree.sh", "text/plain"), ("clean", "make clean", "text/plain") ], @@ -111,6 +114,13 @@ tasks = { ("check-clean-tree", "script/clean-source-tree.sh", "text/plain"), ("clean", "make clean", "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" : [ ("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=ad_dc'", "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