1
0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00

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 <abartlet@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
This commit is contained in:
Andrew Bartlett 2017-06-30 11:15:40 +12:00
parent 2532c0db0c
commit 7544f35741

View File

@ -26,6 +26,7 @@ cleanup_list = []
builddirs = { builddirs = {
"ctdb" : "ctdb", "ctdb" : "ctdb",
"samba" : ".", "samba" : ".",
"samba-nt4" : ".",
"samba-xc" : ".", "samba-xc" : ".",
"samba-o3" : ".", "samba-o3" : ".",
"samba-ctdb" : ".", "samba-ctdb" : ".",
@ -48,6 +49,7 @@ builddirs = {
defaulttasks = [ "ctdb", defaulttasks = [ "ctdb",
"samba", "samba",
"samba-nt4",
"samba-xc", "samba-xc",
"samba-o3", "samba-o3",
"samba-ctdb", "samba-ctdb",
@ -90,16 +92,25 @@ tasks = {
("check-clean-tree", "../script/clean-source-tree.sh", "text/plain"), ("check-clean-tree", "../script/clean-source-tree.sh", "text/plain"),
("clean", "make clean", "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"), "samba" : [ ("configure", "./configure.developer --with-selftest-prefix=./bin/ab" + samba_configure_params, "text/plain"),
("make", "make -j", "text/plain"), ("make", "make -j", "text/plain"),
("test", "make test FAIL_IMMEDIATELY=1 " ("test", "make test FAIL_IMMEDIATELY=1 "
"TESTS='--exclude-env=none'", "TESTS='--exclude-env=none "
"text/plain"), "--exclude-env=nt4_dc "
"--exclude-env=nt4_member'", "text/plain"),
("install", "make install", "text/plain"), ("install", "make install", "text/plain"),
("check-clean-tree", "script/clean-source-tree.sh", "text/plain"), ("check-clean-tree", "script/clean-source-tree.sh", "text/plain"),
("clean", "make clean", "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"), "samba-test-only" : [ ("configure", "./configure.developer --with-selftest-prefix=./bin/ab --abi-check-disable" + samba_configure_params, "text/plain"),
("make", "make -j", "text/plain"), ("make", "make -j", "text/plain"),
("test", 'make test FAIL_IMMEDIATELY=1 TESTS="${TESTS}"',"text/plain") ], ("test", 'make test FAIL_IMMEDIATELY=1 TESTS="${TESTS}"',"text/plain") ],