Skip to content

Commit

Permalink
selftest:Samba4: add fl2008dc as alias to ad_dc_ntvfs
Browse files Browse the repository at this point in the history
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 <[email protected]>
Reviewed-by: Andreas Schneider <[email protected]>
  • Loading branch information
metze-samba committed Feb 27, 2019
1 parent ec115b9 commit 62eeab8
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 2 deletions.
7 changes: 5 additions & 2 deletions script/autobuild.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@
"--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 "
Expand Down Expand Up @@ -163,8 +164,10 @@
("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
Expand Down
17 changes: 17 additions & 0 deletions selftest/target/Samba4.pm
Original file line number Diff line number Diff line change
Expand Up @@ -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) = @_;
Expand Down

0 comments on commit 62eeab8

Please sign in to comment.