summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2019-02-26 14:03:29 +0100
committerStefan Metzmacher <metze@samba.org>2019-02-27 10:16:10 +0000
commitc217a15a2c3c6b6c171d28a57f9b0248dacaec53 (patch)
tree9b7d163c29776f17243001f4a8ee85c542097179
parent3385b33cec1595374b2866ba5553acc6ed144ff4 (diff)
downloadsamba-c217a15a2c3c6b6c171d28a57f9b0248dacaec53.tar.gz
selftest:Samba4: add ad_dc_default alias to ad_dc_ntvfs
This will allow us to run really most tests in an isolated autobuild/ci task later. This will apply to tests, which may not rely on the ntvfs backend, so the ad_dc_default alias can point to another environment in future. Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Andreas Schneider <asn@samba.org>
-rwxr-xr-xscript/autobuild.py2
-rwxr-xr-xselftest/target/Samba4.pm7
2 files changed, 9 insertions, 0 deletions
diff --git a/script/autobuild.py b/script/autobuild.py
index b3ad1cbbc5c..d9c7ab16a40 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -95,6 +95,7 @@ tasks = {
"--exclude-env=nt4_member "
"--exclude-env=ad_dc "
"--exclude-env=ad_dc_ntvfs "
+ "--exclude-env=ad_dc_default "
"--exclude-env=ad_dc_slowtests "
"--exclude-env=ad_dc_no_nss "
"--exclude-env=fl2003dc "
@@ -168,6 +169,7 @@ tasks = {
"TESTS='"
"--include-env=ad_dc_ntvfs "
"--include-env=fl2008dc "
+ "--include-env=ad_dc_default "
"--include-env=ad_dc_slowtests "
"'", "text/plain"),
("check-clean-tree", "script/clean-source-tree.sh", "text/plain")],
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 524fe9517a3..313e2705e1c 100755
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -2263,6 +2263,7 @@ sub check_env($$)
# aliases in order to split autbuild tasks
fl2008dc => ["ad_dc_ntvfs"],
+ ad_dc_default => ["ad_dc_ntvfs"],
ad_dc_slowtests => ["ad_dc_ntvfs"],
none => [],
@@ -2282,6 +2283,12 @@ sub setup_fl2008dc
return $self->return_alias_env($path, $dep_env)
}
+sub setup_ad_dc_default
+{
+ my ($self, $path, $dep_env) = @_;
+ return $self->return_alias_env($path, $dep_env)
+}
+
sub setup_ad_dc_slowtests
{
my ($self, $path, $dep_env) = @_;