vfs_streams_xattr: always pass NULL as fsp arg to get_ea_value()

[samba.git] / selftest / selftest.pl

diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index b00ab486e87bd11855d853678d08fe6b80dd44d4..b3ef65828d7116dd3ed92c13be54a1ef1d258fa1 100755 (executable)
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -47,6 +47,8 @@ my $opt_random_order = 0;
 my $opt_one = 0;
 my @opt_exclude = ();
 my @opt_include = ();
+my @opt_exclude_env = ();
+my @opt_include_env = ();
 my $opt_testenv = 0;
 my $opt_list = 0;
 my $opt_mitkrb5 = 0;
@@ -198,6 +200,8 @@ Generic options:
  --testlist=FILE            file to read available tests from
  --exclude=FILE             Exclude tests listed in the file
  --include=FILE             Include tests listed in the file
+ --exclude-env=ENV          Exclude tests for the specified environment
+ --include-env=ENV          Include tests for the specified environment
 
 Paths:
  --prefix=DIR               prefix to run tests in [st]
@@ -243,6 +247,8 @@ my $result = GetOptions (
                'one' => \$opt_one,
                'exclude=s' => \@opt_exclude,
                'include=s' => \@opt_include,
+               'exclude-env=s' => \@opt_exclude_env,
+               'include-env=s' => \@opt_include_env,
                'srcdir=s' => \$srcdir,
                'bindir=s' => \$bindir,
                'testenv' => \$opt_testenv,
@@ -324,6 +330,8 @@ my $srcdir_abs = abs_path($srcdir);
 die("using an empty absolute prefix isn't allowed") unless $prefix_abs ne "";
 die("using '/' as absolute prefix isn't allowed") unless $prefix_abs ne "/";
 
+$ENV{SAMBA_SELFTEST} = "1";
+
 $ENV{PREFIX} = $prefix;
 $ENV{PREFIX_ABS} = $prefix_abs;
 $ENV{SRCDIR} = $srcdir;
@@ -443,7 +451,7 @@ if (defined($ENV{SMBD_MAXTIME}) and $ENV{SMBD_MAXTIME} ne "") {
 
 unless ($opt_list) {
        if ($opt_target eq "samba") {
-               $testenv_default = "ad_dc_ntvfs";
+               $testenv_default = "ad_dc";
                require target::Samba;
                $target = new Samba($bindir, $ldap, $srcdir, $server_maxtime);
        } elsif ($opt_target eq "samba3") {
@@ -861,6 +869,7 @@ my @exported_envvars = (
        "DNS_FORWARDER2",
        "RESOLV_CONF",
        "UNACCEPTABLE_PASSWORD",
+       "LOCK_DIR",
 
        # nss_wrapper
        "NSS_WRAPPER_PASSWD",
@@ -1076,13 +1085,39 @@ $envvarstr
                my $cmd = $$_[2];
                my $name = $$_[0];
                my $envname = $$_[1];
+               my ($env_basename, $env_localpart) = split(/:/, $envname);
+               my $envvars = "SKIP";
 
-               my $envvars = setup_env($envname, $prefix);
+               if (@opt_include_env) {
+                   foreach my $env (@opt_include_env) {
+                       if ($env_basename eq $env) {
+                           $envvars = setup_env($envname, $prefix);
+                       }
+                   }
+               } elsif (@opt_exclude_env) {
+                   my $excluded = 0;
+                   foreach my $env (@opt_exclude_env) {
+                       if ($env_basename eq $env) {
+                           $excluded = 1;
+                       }
+                   }
+                   if ($excluded == 0) {
+                       $envvars = setup_env($envname, $prefix);
+                   }
+               } else {
+                   $envvars = setup_env($envname, $prefix);
+               }
+               
                if (not defined($envvars)) {
                        Subunit::start_testsuite($name);
                        Subunit::end_testsuite($name, "error",
                                "unable to set up environment $envname - exiting");
                        next;
+               } elsif ($envvars eq "SKIP") {
+                       Subunit::start_testsuite($name);
+                       Subunit::end_testsuite($name, "skip",
+                               "environment $envname is disabled (via --exclude-env / --include-env command line options) in this test run - skipping");
+                       next;
                } elsif ($envvars eq "UNKNOWN") {
                        Subunit::start_testsuite($name);
                        Subunit::end_testsuite($name, "skip",