# along with this program. If not, see <http://www.gnu.org/licenses/>.
use strict;
+use warnings;
use FindBin qw($RealBin $Script);
use File::Spec;
use File::Temp qw(tempfile);
+use File::Path qw(remove_tree);
use Getopt::Long;
use POSIX;
use Cwd qw(abs_path);
use lib "$RealBin";
use Subunit;
use SocketWrapper;
+use target::Samba;
+use Time::HiRes qw(time);
eval {
require Time::HiRes;
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 $ldap = undef;
+my $opt_mitkrb5 = 0;
+my $opt_default_ldb_backend = "mdb";
my $opt_resetup_env = undef;
-my $opt_binary_mapping = "";
my $opt_load_list = undef;
my $opt_libnss_wrapper_so_path = "";
my $opt_libresolv_wrapper_so_path = "";
my $opt_libsocket_wrapper_so_path = "";
my $opt_libuid_wrapper_so_path = "";
+my $opt_libasan_so_path = "";
+my $opt_libcrypt_so_path = "";
my $opt_use_dns_faking = 0;
my @testlists = ();
return undef;
}
-sub skip($)
+sub skip
{
- my ($name) = @_;
-
- return find_in_list(\@excludes, $name);
-}
-
-sub getlog_env($);
-
-sub setup_pcap($)
-{
- my ($name) = @_;
-
- return unless ($opt_socket_wrapper_pcap);
- return unless defined($ENV{SOCKET_WRAPPER_PCAP_DIR});
-
- my $fname = $name;
- $fname =~ s%[^abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789\-]%_%g;
+ my ($name, $envname) = @_;
+ my ($env_basename, $env_localpart) = split(/:/, $envname);
- my $pcap_file = "$ENV{SOCKET_WRAPPER_PCAP_DIR}/$fname.pcap";
+ if ($opt_target eq "samba3" && $Samba::ENV_NEEDS_AD_DC{$env_basename}) {
+ return "environment $envname is disabled as this build does not include an AD DC";
+ }
- SocketWrapper::setup_pcap($pcap_file);
+ if (@opt_include_env && !(grep {$_ eq $env_basename} @opt_include_env)) {
+ return "environment $envname is disabled (via --include-env command line option) in this test run - skipping";
+ } elsif (@opt_exclude_env && grep {$_ eq $env_basename} @opt_exclude_env) {
+ return "environment $envname is disabled (via --exclude-env command line option) in this test run - skipping";
+ }
- return $pcap_file;
+ return find_in_list(\@excludes, $name);
}
-sub cleanup_pcap($$)
-{
- my ($pcap_file, $exitcode) = @_;
-
- return unless ($opt_socket_wrapper_pcap);
- return if ($opt_socket_wrapper_keep_pcap);
- return unless ($exitcode == 0);
- return unless defined($pcap_file);
-
- unlink($pcap_file);
-}
+sub getlog_env($);
# expand strings from %ENV
sub expand_environment_strings($)
return $s;
}
+my $target;
+
sub run_testsuite($$$$$)
{
my ($envname, $name, $cmd, $i, $totalsuites) = @_;
- my $pcap_file = setup_pcap($name);
+ my $pcap_file = $target->setup_pcap($name);
Subunit::start_testsuite($name);
Subunit::progress_push();
- Subunit::report_time(time());
- system($cmd);
- Subunit::report_time(time());
+ Subunit::report_time();
+ # Enable pipefail so that we catch failing testsuites that are part of a
+ # pipeline (typically, piped through filter-subunit). This won't catch
+ # any testsuite failures that are turned into testsuite-xfails by
+ # filter-subunit.
+ system("bash", "-o", "pipefail", "-c", $cmd);
+ Subunit::report_time();
Subunit::progress_pop();
if ($? == -1) {
- Subunit::progress_pop();
+ print "command: $cmd\n";
+ printf "expanded command: %s\n", expand_environment_strings($cmd);
Subunit::end_testsuite($name, "error", "Unable to run $cmd: $!");
exit(1);
} elsif ($? & 127) {
+ print "command: $cmd\n";
+ printf "expanded command: %s\n", expand_environment_strings($cmd);
Subunit::end_testsuite($name, "error",
sprintf("%s died with signal %d, %s coredump\n", $cmd, ($? & 127), ($? & 128) ? 'with' : 'without'));
exit(1);
Subunit::end_testsuite($name, "failure", "Exit code was $exitcode");
}
- cleanup_pcap($pcap_file, $exitcode);
+ $target->cleanup_pcap($pcap_file, $exitcode);
if (not $opt_socket_wrapper_keep_pcap and defined($pcap_file)) {
print "PCAP FILE: $pcap_file\n";
Copyright (C) Jelmer Vernooij <jelmer\@samba.org>
Copyright (C) Stefan Metzmacher <metze\@samba.org>
-Usage: $Script [OPTIONS] TESTNAME-REGEX
+Usage: $Script [OPTIONS] TESTNAME-REGEX [TESTNAME-REGEX...]
Generic options:
--help this help page
--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]
--resolv_wrapper_so_path=FILE the resolv_wrapper library to preload
--socket_wrapper_so_path=FILE the socket_wrapper library to preload
--uid_wrapper_so_path=FILE the uid_wrapper library to preload
+ --asan_so_path=FILE the asan library to preload
DNS:
--use-dns-faking Fake DNS entries rather than talking to our
Target Specific:
--socket-wrapper-pcap save traffic to pcap directories
- --socket-wrapper-keep-pcap keep all pcap files, not just those for tests that
+ --socket-wrapper-keep-pcap keep all pcap files, not just those for tests that
failed
--socket-wrapper enable socket wrapper
-Samba4 Specific:
- --ldap=openldap|fedora-ds back samba onto specified ldap server
-
Behaviour:
--quick run quick overall test
--one abort when the first test fails
'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,
'list' => \$opt_list,
- 'ldap:s' => \$ldap,
+ 'mitkrb5' => \$opt_mitkrb5,
+ 'default-ldb-backend=s' => \$opt_default_ldb_backend,
'resetup-environment' => \$opt_resetup_env,
'testlist=s' => \@testlists,
'random-order' => \$opt_random_order,
'load-list=s' => \$opt_load_list,
- 'binary-mapping=s' => \$opt_binary_mapping,
'nss_wrapper_so_path=s' => \$opt_libnss_wrapper_so_path,
'resolv_wrapper_so_path=s' => \$opt_libresolv_wrapper_so_path,
'socket_wrapper_so_path=s' => \$opt_libsocket_wrapper_so_path,
'uid_wrapper_so_path=s' => \$opt_libuid_wrapper_so_path,
+ 'asan_so_path=s' => \$opt_libasan_so_path,
+ 'crypt_so_path=s' => \$opt_libcrypt_so_path,
'use-dns-faking' => \$opt_use_dns_faking
);
# make all our python scripts unbuffered
$ENV{PYTHONUNBUFFERED} = 1;
-my $bindir_abs = abs_path($bindir);
+$ENV{SAMBA_DEPRECATED_SUPPRESS} = 1;
-# Backwards compatibility:
-if (defined($ENV{TEST_LDAP}) and $ENV{TEST_LDAP} eq "yes") {
- if (defined($ENV{FEDORA_DS_ROOT})) {
- $ldap = "fedora-ds";
- } else {
- $ldap = "openldap";
- }
-}
+# do not depend on the users setup
+# see also bootstrap/config.py
+$ENV{TZ} = "UTC";
+$ENV{LC_ALL} = $ENV{LANG} = "en_US.utf8";
+
+my $bindir_abs = abs_path($bindir);
my $torture_maxtime = ($ENV{TORTURE_MAXTIME} or 1200);
-if ($ldap) {
- # LDAP is slow
- $torture_maxtime *= 2;
-}
$prefix =~ s+//+/+;
-$prefix =~ s+/./+/+;
+$prefix =~ s+/\./+/+;
$prefix =~ s+/$++;
die("using an empty prefix isn't allowed") unless $prefix ne "";
# permissions on this as some subdirectories in this tree will have
# wider permissions (ie 0777) and this would allow other users on the
# host to subvert the test process.
+umask 0077;
mkdir($prefix, 0700) unless -d $prefix;
chmod 0700, $prefix;
+# We need to have no umask limitations for the tests.
+umask 0000;
my $prefix_abs = abs_path($prefix);
my $tmpdir_abs = abs_path("$prefix/tmp");
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{KRB5CCNAME} = "$prefix/krb5ticket";
$ENV{PREFIX_ABS} = $prefix_abs;
$ENV{SRCDIR} = $srcdir;
$ENV{SRCDIR_ABS} = $srcdir_abs;
my $ld_preload = $ENV{LD_PRELOAD};
+if ($opt_libasan_so_path) {
+ if ($ld_preload) {
+ if ($opt_libcrypt_so_path) {
+ $ld_preload = "$opt_libasan_so_path:$opt_libcrypt_so_path:$ld_preload";
+ } else {
+ $ld_preload = "$opt_libasan_so_path:$ld_preload";
+ }
+ } else {
+ if ($opt_libcrypt_so_path) {
+ $ld_preload = "$opt_libasan_so_path:$opt_libcrypt_so_path";
+ } else {
+ $ld_preload = "$opt_libasan_so_path";
+ }
+ }
+}
+
if ($opt_libnss_wrapper_so_path) {
if ($ld_preload) {
$ld_preload = "$ld_preload:$opt_libnss_wrapper_so_path";
}
}
+if (defined($ENV{USE_NAMESPACES})) {
+ print "Using linux containerization for selftest testenv(s)...\n";
+
+ # Create a common bridge to connect up the testenv namespaces. We give
+ # it the client's IP address, as this is where the tests will run from
+ my $ipv4_addr = Samba::get_ipv4_addr("client");
+ my $ipv6_addr = Samba::get_ipv6_addr("client");
+ system "$ENV{SRCDIR_ABS}/selftest/ns/create_bridge.sh selftest0 $ipv4_addr $ipv6_addr";
+}
+
$ENV{LD_PRELOAD} = $ld_preload;
print "LD_PRELOAD=$ENV{LD_PRELOAD}\n";
# Enable uid_wrapper globally
$ENV{UID_WRAPPER} = 1;
+# We are already hitting the limit, so double it.
+$ENV{NSS_WRAPPER_MAX_HOSTENTS} = 200;
+
# Disable RTLD_DEEPBIND hack for Samba bind dlz module
#
# This is needed in order to allow the ldb_*ldap module
$ENV{SAMBA_DNS_FAKING} = 1;
}
-my $target;
my $testenv_default = "none";
-my %binary_mapping = ();
-if ($opt_binary_mapping) {
- my @binmapping_list = split(/,/, $opt_binary_mapping);
- foreach my $mapping (@binmapping_list) {
- my ($bin, $map) = split(/\:/, $mapping);
- $binary_mapping{$bin} = $map;
- }
+if ($opt_mitkrb5 == 1) {
+ $ENV{MITKRB5} = $opt_mitkrb5;
+ $ENV{KRB5RCACHETYPE} = "none";
}
-$ENV{BINARY_MAPPING} = $opt_binary_mapping;
-
# After this many seconds, the server will self-terminate. All tests
# must terminate in this time, and testenv will only stay alive this
# long
-my $server_maxtime = 7500;
+my $server_maxtime;
+if ($opt_testenv) {
+ # 1 year should be enough :-)
+ $server_maxtime = 365 * 24 * 60 * 60;
+} else {
+ # make test should run under 5 hours
+ $server_maxtime = 5 * 60 * 60;
+}
+
if (defined($ENV{SMBD_MAXTIME}) and $ENV{SMBD_MAXTIME} ne "") {
$server_maxtime = $ENV{SMBD_MAXTIME};
}
+$target = new Samba($bindir, $srcdir, $server_maxtime,
+ $opt_socket_wrapper_pcap,
+ $opt_socket_wrapper_keep_pcap,
+ $opt_default_ldb_backend);
unless ($opt_list) {
if ($opt_target eq "samba") {
- $testenv_default = "dc";
- require target::Samba;
- $target = new Samba($bindir, \%binary_mapping, $ldap, $srcdir, $server_maxtime);
+ $testenv_default = "ad_dc";
} elsif ($opt_target eq "samba3") {
- $testenv_default = "member";
- require target::Samba3;
- $target = new Samba3($bindir, \%binary_mapping, $srcdir_abs, $server_maxtime);
+ $testenv_default = "nt4_member";
}
}
my ($name) = @_;
my @ret = ();
open(LF, "<$name") or die("unable to read $name: $!");
- while (<LF>) {
- chomp;
+ while (<LF>) {
+ chomp;
next if (/^#/);
if (/^(.*?)([ \t]+)\#([\t ]*)(.*?)$/) {
push (@ret, [$1, $4]);
} else {
s/^(.*?)([ \t]+)\#([\t ]*)(.*?)$//;
- push (@ret, [$_, undef]);
+ push (@ret, [$_, undef]);
}
}
close(LF);
push (@includes, read_test_regexes($_));
}
-my $interfaces = join(',', ("127.0.0.11/8",
- "127.0.0.12/8",
- "127.0.0.13/8",
- "127.0.0.14/8",
- "127.0.0.15/8",
- "127.0.0.16/8"));
+# We give the selftest client 6 different IPv4 addresses to use. Most tests
+# only use the first (.11) IP. Note that winsreplication.c is one test that
+# uses the other IPs (search for iface_list_count()).
+$ENV{SOCKET_WRAPPER_IPV4_NETWORK} = "10.53.57.0";
+my $interfaces = Samba::get_interfaces_config("client", 6);
my $clientdir = "$prefix_abs/client";
mkdir("$clientdir", 0777) unless -d "$clientdir";
- if ( -d "$clientdir/private" ) {
- unlink <$clientdir/private/*>;
- } else {
- mkdir("$clientdir/private", 0777);
- }
-
- if ( -d "$clientdir/lockdir" ) {
- unlink <$clientdir/lockdir/*>;
- } else {
- mkdir("$clientdir/lockdir", 0777);
- }
-
- if ( -d "$clientdir/statedir" ) {
- unlink <$clientdir/statedir/*>;
- } else {
- mkdir("$clientdir/statedir", 0777);
+ my @subdirs = (
+ { name => "private", mask => 0777 },
+ { name => "bind-dns", mask => 0777 },
+ { name => "lockdir", mask => 0777 },
+ { name => "statedir", mask => 0777 },
+ { name => "cachedir", mask => 0777 },
+ { name => "pkinit", mask => 0700 },
+ { name => "pid", mask => 0777 },
+ # the ncalrpcdir needs exactly 0755 otherwise tests fail.
+ { name => "ncalrpcdir", mask => 0755, umask => 0022 },
+ );
+
+ foreach my $sub (@subdirs) {
+ my $dir = "$clientdir/$sub->{name}";
+ remove_tree($dir);
+ my $mask = umask;
+ if (defined($sub->{umask})) {
+ umask $sub->{umask};
+ }
+ mkdir($dir, $sub->{mask});
+ umask $mask;
}
- if ( -d "$clientdir/cachedir" ) {
- unlink <$clientdir/cachedir/*>;
- } else {
- mkdir("$clientdir/cachedir", 0777);
- }
+ my $cadir = "$ENV{SRCDIR_ABS}/selftest/manage-ca/CA-samba.example.com";
+ my $cacert = "$cadir/Public/CA-samba.example.com-cert.pem";
+ my $cacrl_pem = "$cadir/Public/CA-samba.example.com-crl.pem";
+ my $ca_users_dir = "$cadir/Users";
+ my $client_loglevel = $ENV{CLIENT_LOG_LEVEL} || 1;
- # this is ugly, but the ncalrpcdir needs exactly 0755
- # otherwise tests fail.
+ # each user has a USER-${USER_PRINCIPAL_NAME}-cert.pem and
+ # USER-${USER_PRINCIPAL_NAME}-private-key.pem symlink
+ # We make a copy here and make the certificated easily
+ # accessable in the client environment.
my $mask = umask;
- umask 0022;
- if ( -d "$clientdir/ncalrpcdir/np" ) {
- unlink <$clientdir/ncalrpcdir/np/*>;
- rmdir "$clientdir/ncalrpcdir/np";
- }
- if ( -d "$clientdir/ncalrpcdir" ) {
- unlink <$clientdir/ncalrpcdir/*>;
- rmdir "$clientdir/ncalrpcdir";
+ umask 0077;
+ opendir USERS, "${ca_users_dir}" or die "Could not open dir '${ca_users_dir}': $!";
+ for my $d (readdir USERS) {
+ my $user_dir = "${ca_users_dir}/${d}";
+ next if ${d} =~ /^\./;
+ next if (! -d "${user_dir}");
+ opendir USER, "${user_dir}" or die "Could not open dir '${user_dir}': $!";
+ for my $l (readdir USER) {
+ my $user_link = "${user_dir}/${l}";
+ next if ${l} =~ /^\./;
+ next if (! -l "${user_link}");
+
+ my $dest = "${clientdir}/pkinit/${l}";
+ Samba::copy_file_content(${user_link}, ${dest});
+ }
+ closedir USER;
}
- mkdir("$clientdir/ncalrpcdir", 0755);
+ closedir USERS;
umask $mask;
open(CF, ">$conffile");
}
print CF "
private dir = $clientdir/private
+ binddns dir = $clientdir/bind-dns
lock dir = $clientdir/lockdir
state directory = $clientdir/statedir
cache directory = $clientdir/cachedir
ncalrpc dir = $clientdir/ncalrpcdir
+ pid directory = $clientdir/pid
panic action = $RealBin/gdb_backtrace \%d
max xmit = 32K
notify:inotify = false
ldb:nosync = true
system:anonymous = true
client lanman auth = Yes
- log level = 1
+ client min protocol = CORE
+ log level = $client_loglevel
torture:basedir = $clientdir
-#We don't want to pass our self-tests if the PAC code is wrong
- gensec:require_pac = true
#We don't want to run 'speed' tests for very long
torture:timelimit = 1
winbind separator = /
+ tls cafile = ${cacert}
+ tls crlfile = ${cacrl_pem}
+ tls verify peer = no_check
+ include system krb5 conf = no
+ elasticsearch:mappings = $srcdir_abs/source3/rpc_server/mdssvc/elasticsearch_mappings.json
";
close(CF);
}
$ENV{SELFTEST_PREFIX} = "$prefix_abs";
$ENV{SELFTEST_TMPDIR} = "$tmpdir_abs";
+$ENV{TMPDIR} = "$tmpdir_abs";
$ENV{TEST_DATA_PREFIX} = "$tmpdir_abs";
-if ($opt_socket_wrapper) {
- $ENV{SELFTEST_INTERFACES} = $interfaces;
-} else {
- $ENV{SELFTEST_INTERFACES} = "";
-}
if ($opt_quick) {
$ENV{SELFTEST_QUICK} = "1";
} else {
}
$ENV{SELFTEST_MAXTIME} = $torture_maxtime;
+my $selftest_resolv_conf_path = "$tmpdir_abs/selftest.resolv.conf";
+$ENV{RESOLV_CONF} = "${selftest_resolv_conf_path}.global";
+
+my $selftest_krbt_ccache_path = "$tmpdir_abs/selftest.krb5_ccache";
+$ENV{KRB5CCNAME} = "FILE:${selftest_krbt_ccache_path}.global";
+
+my $selftest_gnupghome_path = "$tmpdir_abs/selftest.no.gnupg";
+$ENV{GNUPGHOME} = "${selftest_gnupghome_path}.global";
+
my @available = ();
foreach my $fn (@testlists) {
foreach (read_testlist($fn)) {
foreach my $testsuite (@available) {
my $name = $$testsuite[0];
- my $skipreason = skip($name);
+ my $skipreason = skip(@$testsuite);
if (defined($restricted)) {
# Find the testsuite for this test
my $match = undef;
unless ($opt_list) {
Subunit::progress($suitestotal);
- Subunit::report_time(time());
+ Subunit::report_time();
}
my $i = 0;
return $running_envs{$envname};
}
-my @exported_envvars = (
- # domain stuff
- "DOMAIN",
- "REALM",
-
- # domain controller stuff
- "DC_SERVER",
- "DC_SERVER_IP",
- "DC_SERVER_IPV6",
- "DC_NETBIOSNAME",
- "DC_NETBIOSALIAS",
-
- # domain member
- "MEMBER_SERVER",
- "MEMBER_SERVER_IP",
- "MEMBER_SERVER_IPV6",
- "MEMBER_NETBIOSNAME",
- "MEMBER_NETBIOSALIAS",
-
- # rpc proxy controller stuff
- "RPC_PROXY_SERVER",
- "RPC_PROXY_SERVER_IP",
- "RPC_PROXY_SERVER_IPV6",
- "RPC_PROXY_NETBIOSNAME",
- "RPC_PROXY_NETBIOSALIAS",
-
- # domain controller stuff for Vampired DC
- "VAMPIRE_DC_SERVER",
- "VAMPIRE_DC_SERVER_IP",
- "VAMPIRE_DC_SERVER_IPV6",
- "VAMPIRE_DC_NETBIOSNAME",
- "VAMPIRE_DC_NETBIOSALIAS",
-
- "PROMOTED_DC_SERVER",
- "PROMOTED_DC_SERVER_IP",
- "PROMOTED_DC_SERVER_IPV6",
- "PROMOTED_DC_NETBIOSNAME",
- "PROMOTED_DC_NETBIOSALIAS",
-
- # server stuff
- "SERVER",
- "SERVER_IP",
- "SERVER_IPV6",
- "NETBIOSNAME",
- "NETBIOSALIAS",
-
- # user stuff
- "USERNAME",
- "USERID",
- "PASSWORD",
- "DC_USERNAME",
- "DC_PASSWORD",
-
- # UID/GID for rfc2307 mapping tests
- "UID_RFC2307TEST",
- "GID_RFC2307TEST",
-
- # misc stuff
- "KRB5_CONFIG",
- "SELFTEST_WINBINDD_SOCKET_DIR",
- "WINBINDD_PRIV_PIPE_DIR",
- "NMBD_SOCKET_DIR",
- "LOCAL_PATH",
-
- # nss_wrapper
- "NSS_WRAPPER_PASSWD",
- "NSS_WRAPPER_GROUP",
- "NSS_WRAPPER_HOSTS",
-
- # resolv_wrapper
- "RESOLV_WRAPPER_CONF",
-);
-
sub sighandler($)
{
my $signame = shift;
$option = "client" if $option eq "";
- if ($envname eq "none") {
- $testenv_vars = {};
- } elsif (defined(get_running_env($envname))) {
+ # Initially clear out the environment for the provision, so previous envs'
+ # variables don't leak in. Provisioning steps must explicitly set their
+ # necessary variables when calling out to other executables
+ Samba::clear_exported_envvars();
+ delete $ENV{SOCKET_WRAPPER_DEFAULT_IFACE};
+ delete $ENV{SMB_CONF_PATH};
+
+ $ENV{RESOLV_CONF} = "${selftest_resolv_conf_path}.${envname}/ignore";
+ $ENV{KRB5CCNAME} = "FILE:${selftest_krbt_ccache_path}.${envname}/ignore";
+ $ENV{GNUPGHOME} = "${selftest_gnupghome_path}.${envname}/ignore";
+
+ if (defined(get_running_env($envname))) {
$testenv_vars = get_running_env($envname);
if (not $testenv_vars->{target}->check_env($testenv_vars)) {
print $testenv_vars->{target}->getlog_env($testenv_vars);
}
} else {
$testenv_vars = $target->setup_env($envname, $prefix);
- if (defined($testenv_vars) and $testenv_vars eq "UNKNOWN") {
- return $testenv_vars;
- } elsif (defined($testenv_vars) && not defined($testenv_vars->{target})) {
- $testenv_vars->{target} = $target;
- }
if (not defined($testenv_vars)) {
- warn("$opt_target can't start up known environment '$envname'");
+ my $msg = "$opt_target can't start up known environment '$envname'";
+ if ($opt_one) {
+ die($msg);
+ }
+ warn $msg;
+ return;
+ }
+ if (ref $testenv_vars ne "HASH") {
+ return $testenv_vars;
+ }
+ if (defined($testenv_vars->{target})) {
+ $testenv_vars->{target} = $target;
}
}
die("Unknown option[$option] for envname[$envname]");
}
- foreach (@exported_envvars) {
- if (defined($testenv_vars->{$_})) {
- $ENV{$_} = $testenv_vars->{$_};
- } else {
- delete $ENV{$_};
- }
- }
+ # export the environment variables for the testenv (SERVER, SERVER_IP, etc)
+ Samba::export_envvars($testenv_vars);
+ my $krb5_ccache_path = "${selftest_krbt_ccache_path}.${envname}.${option}";
+ unlink($krb5_ccache_path);
+ $ENV{KRB5CCNAME} = "FILE:${krb5_ccache_path}";
return $testenv_vars;
}
-sub exported_envvars_str($)
-{
- my ($testenv_vars) = @_;
- my $out = "";
-
- foreach (@exported_envvars) {
- next unless defined($testenv_vars->{$_});
- $out .= $_."=".$testenv_vars->{$_}."\n";
- }
-
- return $out;
-}
-
sub getlog_env($)
{
my ($envname) = @_;
sub check_env($)
{
my ($envname) = @_;
- return 1 if ($envname eq "none");
my $env = get_running_env($envname);
return $env->{target}->check_env($env);
}
$ENV{PIDDIR} = $testenv_vars->{PIDDIR};
$ENV{ENVNAME} = $testenv_name;
- my $envvarstr = exported_envvars_str($testenv_vars);
+ my $envvarstr = Samba::exported_envvars_str($testenv_vars);
my @term_args = ("echo -e \"
Welcome to the Samba4 Test environment '$testenv_name'
my @term = ();
if ($ENV{TERMINAL}) {
@term = ($ENV{TERMINAL});
+ # override the default terminal args (if specified)
+ if (defined($ENV{TERMINAL_ARGS})) {
+ @term_args = split(/ /, $ENV{TERMINAL_ARGS});
+ }
} else {
@term = ("xterm", "-e");
unshift(@term_args, ("bash", "-c"));
my $cmd = $$_[2];
my $name = $$_[0];
my $envname = $$_[1];
-
my $envvars = setup_env($envname, $prefix);
+
if (not defined($envvars)) {
Subunit::start_testsuite($name);
Subunit::end_testsuite($name, "error",
next;
} elsif ($envvars eq "UNKNOWN") {
Subunit::start_testsuite($name);
- Subunit::end_testsuite($name, "skip",
- "environment $envname is unknown in this test backend - skipping");
+ Subunit::end_testsuite($name, "error",
+ "environment $envname is unknown - exiting");
next;
}
- # Generate a file with the individual tests to run, if the
+ # Generate a file with the individual tests to run, if the
# test runner for this test suite supports it.
if ($individual_tests and $individual_tests->{$name}) {
if ($$_[3]) {
git.samba.org / bbaumbach / samba-autobuild / .git / blobdiff