selftest:Samba4: add fl2008dc as alias to ad_dc_ntvfs

Using aliases it will be possible to split the large amount
of tests which use ad_dc_ntvfs into multiple autobuild/ci
tasks/jobs later.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>

diff --git a/script/autobuild.py b/script/autobuild.py
index 729f118019c24851cc861e9979c245777c114298..5e6d4d2feffb08beaf4dab44bbcbab5dee6fd764 100755 (executable)
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -97,6 +97,7 @@ tasks = {
                  "--exclude-env=ad_dc_ntvfs "
                  "--exclude-env=ad_dc_no_nss "
                  "--exclude-env=fl2003dc "
+                 "--exclude-env=fl2008dc "
                  "--exclude-env=fl2008r2dc "
                  "--exclude-env=ad_member "
                  "--exclude-env=ad_member_idmap_rid "
@@ -163,8 +164,10 @@ tasks = {
                       ("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_ntvfs'",
-                       "text/plain"),
+                       "TESTS='"
+                       "--include-env=ad_dc_ntvfs "
+                       "--include-env=fl2008dc "
+                       "'", "text/plain"),
                       ("check-clean-tree", "script/clean-source-tree.sh", "text/plain")],
 
     # run the backup/restore testenvs separately as they're fairly standalone

diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index e4b05997a0cd261a0dffef87c7f26e2675a821a1..46b04e2668ba52a134b72fb99b782be9a2723cc5 100755 (executable)
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -2261,9 +2261,26 @@ sub check_env($$)
        offlinebackupdc      => ["backupfromdc"],
        labdc                => ["backupfromdc"],
 
+       # aliases in order to split autbuild tasks
+       fl2008dc             => ["ad_dc_ntvfs"],
+
        none                 => [],
 );
 
+sub return_alias_env
+{
+       my ($self, $path, $env) = @_;
+
+       # just an alias
+       return $env;
+}
+
+sub setup_fl2008dc
+{
+       my ($self, $path, $dep_env) = @_;
+       return $self->return_alias_env($path, $dep_env)
+}
+
 sub setup_s4member
 {
        my ($self, $path, $dc_vars) = @_;