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_use_dns_faking = 0;
my @testlists = ();
my $srcdir = ".";
my @includes = ();
my @excludes = ();
-sub pipe_handler {
- my $sig = shift @_;
- print STDERR "Exiting early because of SIGPIPE.\n";
- exit(1);
-}
-
-$SIG{PIPE} = \&pipe_handler;
-
sub find_in_list($$)
{
my ($list, $fullname) = @_;
--help this help page
--target=samba[3]|win Samba version to target
--testlist=FILE file to read available tests from
+ --exclude=FILE Exclude tests listed in the file
+ --include=FILE Include tests listed in the file
Paths:
--prefix=DIR prefix to run tests in [st]
--srcdir=DIR source directory [.]
--bindir=DIR binaries directory [./bin]
+Preload cwrap:
+ --nss_wrapper_so_path=FILE the nss_wrapper library to preload
+ --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
+
+DNS:
+ --use-dns-faking Fake DNS entries rather than talking to our
+ DNS implementation.
+
Target Specific:
--socket-wrapper-pcap save traffic to pcap directories
--socket-wrapper-keep-pcap keep all pcap files, not just those for tests that
'testlist=s' => \@testlists,
'random-order' => \$opt_random_order,
'load-list=s' => \$opt_load_list,
- 'binary-mapping=s' => \$opt_binary_mapping
+ '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,
+ 'use-dns-faking' => \$opt_use_dns_faking
);
exit(1) if (not $result);
# quick hack to disable rpc validation when using valgrind - its way too slow
unless (defined($ENV{VALGRIND})) {
$ENV{VALIDATE} = "validate";
- $ENV{MALLOC_CHECK_} = 2;
+ $ENV{MALLOC_CHECK_} = 3;
}
# make all our python scripts unbuffered
$opt_socket_wrapper = 1;
}
+my $ld_preload = $ENV{LD_PRELOAD};
+
+if ($opt_libnss_wrapper_so_path) {
+ if ($ld_preload) {
+ $ld_preload = "$ld_preload:$opt_libnss_wrapper_so_path";
+ } else {
+ $ld_preload = "$opt_libnss_wrapper_so_path";
+ }
+}
+
+if ($opt_libresolv_wrapper_so_path) {
+ if ($ld_preload) {
+ $ld_preload = "$ld_preload:$opt_libresolv_wrapper_so_path";
+ } else {
+ $ld_preload = "$opt_libresolv_wrapper_so_path";
+ }
+}
+
+if ($opt_libsocket_wrapper_so_path) {
+ if ($ld_preload) {
+ $ld_preload = "$ld_preload:$opt_libsocket_wrapper_so_path";
+ } else {
+ $ld_preload = "$opt_libsocket_wrapper_so_path";
+ }
+}
+
+if ($opt_libuid_wrapper_so_path) {
+ if ($ld_preload) {
+ $ld_preload = "$ld_preload:$opt_libuid_wrapper_so_path";
+ } else {
+ $ld_preload = "$opt_libuid_wrapper_so_path";
+ }
+}
+
+$ENV{LD_PRELOAD} = $ld_preload;
+print "LD_PRELOAD=$ENV{LD_PRELOAD}\n";
+
+# Enable uid_wrapper globally
+$ENV{UID_WRAPPER} = 1;
+
+# Disable RTLD_DEEPBIND hack for Samba bind dlz module
+#
+# This is needed in order to allow the ldb_*ldap module
+# to work with a preloaded socket wrapper.
+$ENV{LDB_MODULES_DISABLE_DEEPBIND} = 1;
+
my $socket_wrapper_dir;
if ($opt_socket_wrapper) {
$socket_wrapper_dir = SocketWrapper::setup_dir("$prefix_abs/w", $opt_socket_wrapper_pcap);
}
}
+if ($opt_use_dns_faking) {
+ print "DNS: Faking namerserver\n";
+ $ENV{SAMBA_DNS_FAKING} = 1;
+}
+
my $target;
my $testenv_default = "none";
unless ($opt_list) {
if ($opt_target eq "samba") {
- if ($opt_socket_wrapper and `$bindir/smbd -b | grep SOCKET_WRAPPER` eq "") {
- die("You must include --enable-socket-wrapper when compiling Samba in order to execute 'make test'. Exiting....");
- }
$testenv_default = "dc";
require target::Samba;
$target = new Samba($bindir, \%binary_mapping, $ldap, $srcdir, $server_maxtime);
} elsif ($opt_target eq "samba3") {
- if ($opt_socket_wrapper and `$bindir/smbd -b | grep SOCKET_WRAPPER` eq "") {
- die("You must include --enable-socket-wrapper when compiling Samba in order to execute 'make test'. Exiting....");
- }
$testenv_default = "member";
require target::Samba3;
$target = new Samba3($bindir, \%binary_mapping, $srcdir_abs, $server_maxtime);
state directory = $clientdir/statedir
cache directory = $clientdir/cachedir
ncalrpc dir = $clientdir/ncalrpcdir
- name resolve order = file bcast
panic action = $RealBin/gdb_backtrace \%d
max xmit = 32K
notify:inotify = false
torture:basedir = $clientdir
#We don't want to pass our self-tests if the PAC code is wrong
gensec:require_pac = true
- resolv:host file = $prefix_abs/dns_host_file
#We don't want to run 'speed' tests for very long
torture:timelimit = 1
+ winbind separator = /
";
close(CF);
}
open(IN, $filename) or die("Unable to open $filename: $!");
while (<IN>) {
- if (/-- TEST(-LOADLIST|-IDLIST|) --\n/) {
+ if (/-- TEST(-LOADLIST|) --\n/) {
my $supports_loadlist = (defined($1) and $1 eq "-LOADLIST");
- my $supports_idlist = (defined($1) and $1 eq "-IDLIST");
my $name = <IN>;
$name =~ s/\n//g;
my $env = <IN>;
$env =~ s/\n//g;
+ my $loadlist;
+ if ($supports_loadlist) {
+ $loadlist = <IN>;
+ $loadlist =~ s/\n//g;
+ }
my $cmdline = <IN>;
$cmdline =~ s/\n//g;
if (should_run_test($name) == 1) {
- push (@ret, [$name, $env, $cmdline, $supports_loadlist, $supports_idlist]);
+ push (@ret, [$name, $env, $cmdline, $loadlist]);
}
} else {
print;
}
}
- close(IN) or die("Error creating recipe");
+ close(IN) or die("Error creating recipe from $filename");
return @ret;
}
# 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",
"DC_USERNAME",
"DC_PASSWORD",
+ # UID/GID for rfc2307 mapping tests
+ "UID_RFC2307TEST",
+ "GID_RFC2307TEST",
+
# misc stuff
"KRB5_CONFIG",
- "WINBINDD_SOCKET_DIR",
+ "SELFTEST_WINBINDD_SOCKET_DIR",
"WINBINDD_PRIV_PIPE_DIR",
"NMBD_SOCKET_DIR",
"LOCAL_PATH",
- # nss_wrapper
- "NSS_WRAPPER_PASSWD",
- "NSS_WRAPPER_GROUP",
+ # nss_wrapper
+ "NSS_WRAPPER_PASSWD",
+ "NSS_WRAPPER_GROUP",
+ "NSS_WRAPPER_HOSTS",
- # UID/GID for rfc2307 mapping tests
- "UID_RFC2307TEST",
- "GID_RFC2307TEST"
+ # resolv_wrapper
+ "RESOLV_WRAPPER_CONF",
);
-$SIG{INT} = $SIG{QUIT} = $SIG{TERM} = sub {
+sub sighandler($)
+{
my $signame = shift;
+
+ $SIG{INT} = $SIG{QUIT} = $SIG{TERM} = 'DEFAULT';
+ $SIG{PIPE} = 'IGNORE';
+
+ open(STDOUT, ">&STDERR") or die "can't dup STDOUT to STDERR: $!";
+
+ print "$0: PID[$$]: Got SIG${signame} teardown environments.\n";
teardown_env($_) foreach(keys %running_envs);
- die("Received signal $signame");
+ system("pstree -p $$");
+ print "$0: PID[$$]: Exiting...\n";
+ exit(1);
};
+$SIG{INT} = $SIG{QUIT} = $SIG{TERM} = $SIG{PIPE} = \&sighandler;
+
sub setup_env($$)
{
my ($name, $prefix) = @_;
}
}
-
return undef unless defined($testenv_vars);
$running_envs{$envname} = $testenv_vars;
{
my ($envname) = @_;
return if ($envname eq "none");
+ print STDERR "teardown_env($envname)\n";
my $env = get_running_env($envname);
$env->{target}->teardown_env($env);
delete $running_envs{$envname};
# This 'global' file needs to be empty when we start
unlink("$prefix_abs/dns_host_file");
+unlink("$prefix_abs/hosts");
if ($opt_random_order) {
require List::Util;
teardown_env($testenv_name);
} elsif ($opt_list) {
foreach (@todo) {
- my $cmd = $$_[2];
my $name = $$_[0];
my $envname = $$_[1];
+ my $cmd = $$_[2];
+ my $listcmd = $$_[3];
- unless($cmd =~ /\$LISTOPT/) {
+ unless (defined($listcmd)) {
warn("Unable to list tests in $name");
+ # Rather than ignoring this testsuite altogether, just pretend the entire testsuite is
+ # a single "test".
+ print "$name\n";
next;
}
- $cmd =~ s/\$LISTOPT/--list/g;
-
- system($cmd);
+ system($listcmd);
if ($? == -1) {
- die("Unable to run $cmd: $!");
+ die("Unable to run $listcmd: $!");
} elsif ($? & 127) {
- die(sprintf("%s died with signal %d, %s coredump\n", $cmd, ($? & 127), ($? & 128) ? 'with' : 'without'));
+ die(sprintf("%s died with signal %d, %s coredump\n", $listcmd, ($? & 127), ($? & 128) ? 'with' : 'without'));
}
my $exitcode = $? >> 8;
print $fh substr($test, length($name)+1) . "\n";
}
$cmd =~ s/\$LOADLIST/--load-list=$listid_file/g;
- } elsif ($$_[4]) {
- $cmd =~ s/\s+[^\s]+\s*$//;
- $cmd .= " " . join(' ', @{$individual_tests->{$name}});
+ } else {
+ warn("Unable to run individual tests in $name, it does not support --loadlist.");
}
}
git.samba.org / obnox / samba / samba-obnox.git / blobdiff