summaryrefslogtreecommitdiff
path: root/script
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2018-03-21 07:02:42 +1300
committerAndrew Bartlett <abartlet@samba.org>2018-03-27 23:03:14 +0200
commit56191dcfb783913742a373671901def7db28e842 (patch)
tree3e7eeab02732df55d563f6cbb9112bcbd2cfe226 /script
parent474b39ce56c006b922118fae176d9e5a5f62ad49 (diff)
downloadsamba-56191dcfb783913742a373671901def7db28e842.tar.gz
autobuild: Split up the build further with samba-ad-dc-2
Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
Diffstat (limited to 'script')
-rwxr-xr-xscript/autobuild.py12
1 files changed, 12 insertions, 0 deletions
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") ],