#!/usr/bin/perl
# Bootstrap Samba and run a number of tests against it.
-# Copyright (C) 2005-2009 Jelmer Vernooij <jelmer@samba.org>
+# Copyright (C) 2005-2010 Jelmer Vernooij <jelmer@samba.org>
# Copyright (C) 2007-2009 Stefan Metzmacher <metze@samba.org>
# This program is free software; you can redistribute it and/or modify
use POSIX;
use Cwd qw(abs_path);
use lib "$RealBin";
-use Subunit qw(parse_results);
-use Subunit::Filter;
+use Subunit;
use SocketWrapper;
+eval {
+require Time::HiRes;
+};
+unless ($@) {
+ use Time::HiRes qw(time);
+}
+
my $opt_help = 0;
my $opt_target = "samba4";
my $opt_quick = 0;
my $opt_image = undef;
my $opt_testenv = 0;
my $ldap = undef;
-my $opt_analyse_cmd = undef;
my $opt_resetup_env = undef;
my $opt_bindir = undef;
-my $opt_no_lazy_setup = undef;
my $opt_load_list = undef;
my @testlists = ();
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) = @_;
Subunit::start_testsuite($name);
Subunit::progress_push();
Subunit::report_time(time());
+ system($cmd);
+ Subunit::report_time(time());
+ Subunit::progress_pop();
- open(RESULTS, "$cmd 2>&1|");
- my $statistics = {
- TESTS_UNEXPECTED_OK => 0,
- TESTS_EXPECTED_OK => 0,
- TESTS_UNEXPECTED_FAIL => 0,
- TESTS_EXPECTED_FAIL => 0,
- TESTS_ERROR => 0,
- TESTS_SKIP => 0,
- };
-
- my $msg_ops = new Subunit::Filter("$name\.", []);
-
- parse_results($msg_ops, $statistics, *RESULTS);
-
- my $ret = 0;
-
- unless (close(RESULTS)) {
- if ($!) {
- Subunit::progress_pop();
- Subunit::end_testsuite($name, "error", "Unable to run $cmd: $!");
- return 0;
- } else {
- $ret = $?;
- }
- }
-
- if ($ret & 127) {
+ if ($? == -1) {
Subunit::progress_pop();
- Subunit::end_testsuite($name, "error", sprintf("Testsuite died with signal %d, %s coredump", ($ret & 127), ($ret & 128) ? "with": "without"));
+ Subunit::end_testsuite($name, "error", "Unable to run $cmd: $!");
return 0;
+ } elsif ($? & 127) {
+ Subunit::end_testsuite($name, "error",
+ sprintf("%s died with signal %d, %s coredump\n", $cmd, ($? & 127), ($? & 128) ? 'with' : 'without'));
+ exit(1);
}
+
+ my $exitcode = $? >> 8;
+
my $envlog = getlog_env($envname);
if ($envlog ne "") {
print "envlog: $envlog\n";
print "command: $cmd\n";
printf "expanded command: %s\n", expand_environment_strings($cmd);
- my $exitcode = $ret >> 8;
-
- Subunit::report_time(time());
- Subunit::progress_pop();
if ($exitcode == 0) {
Subunit::end_testsuite($name, "success");
} else {
'verbose' => \$opt_verbose,
'testenv' => \$opt_testenv,
'ldap:s' => \$ldap,
- 'analyse-cmd=s' => \$opt_analyse_cmd,
- 'no-lazy-setup' => \$opt_no_lazy_setup,
'resetup-environment' => \$opt_resetup_env,
'bindir:s' => \$opt_bindir,
'image=s' => \$opt_image,
mkdir($prefix, 0777) unless -d $prefix;
my $prefix_abs = abs_path($prefix);
+my $tmpdir_abs = abs_path("$prefix/tmp");
+mkdir($tmpdir_abs, 0777) unless -d $tmpdir_abs;
+
my $srcdir_abs = abs_path($srcdir);
my $builddir_abs = abs_path($builddir);
push (@includes, read_test_regexes($_));
}
-my $interfaces = join(',', ("127.0.0.6/8",
- "127.0.0.7/8",
- "127.0.0.8/8",
- "127.0.0.9/8",
- "127.0.0.10/8",
- "127.0.0.11/8"));
+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"));
+
+my $clientdir = "$prefix_abs/client";
-my $conffile = "$prefix_abs/client/client.conf";
+my $conffile = "$clientdir/client.conf";
$ENV{SMB_CONF_PATH} = $conffile;
-sub write_clientconf($$)
+sub write_clientconf($$$)
{
- my ($conffile, $vars) = @_;
+ my ($conffile, $clientdir, $vars) = @_;
+
+ mkdir("$clientdir", 0777) unless -d "$clientdir";
- mkdir("$prefix/client", 0777) unless -d "$prefix/client";
-
- if ( -d "$prefix/client/private" ) {
- unlink <$prefix/client/private/*>;
+ if ( -d "$clientdir/private" ) {
+ unlink <$clientdir/private/*>;
} else {
- mkdir("$prefix/client/private", 0777);
+ mkdir("$clientdir/private", 0777);
}
- if ( -d "$prefix/client/lockdir" ) {
- unlink <$prefix/client/lockdir/*>;
+ if ( -d "$clientdir/lockdir" ) {
+ unlink <$clientdir/lockdir/*>;
} else {
- mkdir("$prefix/client/lockdir", 0777);
+ mkdir("$clientdir/lockdir", 0777);
}
- if ( -d "$prefix_abs/client/ncalrpcdir" ) {
- unlink <$prefix/client/ncalrpcdir/*>;
+ if ( -d "$clientdir/ncalrpcdir" ) {
+ unlink <$clientdir/ncalrpcdir/*>;
} else {
- mkdir("$prefix/client/ncalrpcdir", 0777);
+ mkdir("$clientdir/ncalrpcdir", 0777);
}
open(CF, ">$conffile");
print CF "\tinterfaces = $interfaces\n";
}
print CF "
- private dir = $prefix_abs/client/private
- lock dir = $prefix_abs/client/lockdir
- ncalrpc dir = $prefix_abs/client/ncalrpcdir
+ private dir = $clientdir/private
+ lock dir = $clientdir/lockdir
+ ncalrpc dir = $clientdir/ncalrpcdir
name resolve order = bcast file
panic action = $RealBin/gdb_backtrace \%PID\% \%PROG\%
max xmit = 32K
ldb:nosync = true
system:anonymous = true
client lanman auth = Yes
- torture:basedir = $prefix_abs/client
+ log level = 1
+ torture:basedir = $clientdir
#We don't want to pass our self-tests if the PAC code is wrong
gensec:require_pac = true
modules dir = $ENV{LD_SAMBA_MODULE_PATH}
setup directory = ./setup
resolv:host file = $prefix_abs/dns_host_file
+#We don't want to run 'speed' tests for very long
+ torture:timelimit = 1
";
close(CF);
}
my $testsdir = "$srcdir/selftest";
-my %required_envs = ();
-
sub should_run_test($)
{
my $name = shift;
open(IN, $filename) or die("Unable to open $filename: $!");
while (<IN>) {
- if (/-- TEST(-LOADLIST)? --\n/) {
+ if (/-- TEST(-LOADLIST|-IDLIST|) --\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>;
my $cmdline = <IN>;
$cmdline =~ s/\n//g;
if (should_run_test($name) == 1) {
- $required_envs{$env} = 1;
- push (@ret, [$name, $env, $cmdline, $supports_loadlist]);
+ push (@ret, [$name, $env, $cmdline, $supports_loadlist, $supports_idlist]);
}
} else {
print;
}
$ENV{SELFTEST_PREFIX} = "$prefix_abs";
+$ENV{SELFTEST_TMPDIR} = "$tmpdir_abs";
if ($opt_socket_wrapper) {
$ENV{SELFTEST_INTERFACES} = $interfaces;
} else {
}
my $restricted = undef;
+my $restricted_used = {};
if ($opt_load_list) {
$restricted = [];
open(LOAD_LIST, "<$opt_load_list") or die("Unable to open $opt_load_list");
- while (<LOAD_LIST>) {
- chomp;
+ while (<LOAD_LIST>) {
+ chomp;
push (@$restricted, $_);
}
close(LOAD_LIST);
}
-Subunit::progress($#available+1);
-Subunit::report_time(time());
-
my $individual_tests = undef;
$individual_tests = {};
foreach my $testsuite (@available) {
my $name = $$testsuite[0];
my $skipreason = skip($name);
- if (defined($skipreason)) {
- Subunit::skip_testsuite($name, $skipreason);
- } elsif (defined($restricted)) {
+ if (defined($restricted)) {
# Find the testsuite for this test
- my $match = 0;
+ my $match = undef;
foreach my $r (@$restricted) {
if ($r eq $name) {
$individual_tests->{$name} = [];
- $match = 1;
- }
- if ($r =~ /^$name\.(.*)$/) {
- push(@{$individual_tests->{$name}}, $1);
- $match = 1;
+ $match = $r;
+ $restricted_used->{$r} = 1;
+ } elsif (substr($r, 0, length($name)+1) eq "$name.") {
+ push(@{$individual_tests->{$name}}, $r);
+ $match = $r;
+ $restricted_used->{$r} = 1;
+ }
+ }
+ if ($match) {
+ if (defined($skipreason)) {
+ Subunit::skip_testsuite($name, $skipreason);
+ } else {
+ push(@todo, $testsuite);
}
}
- push(@todo, $testsuite) if ($match);
+ } elsif (defined($skipreason)) {
+ Subunit::skip_testsuite($name, $skipreason);
} else {
- push(@todo, $testsuite);
+ push(@todo, $testsuite);
}
}
-if ($#todo == -1) {
+if (defined($restricted)) {
+ foreach (@$restricted) {
+ unless (defined($restricted_used->{$_})) {
+ print "No test or testsuite found matching $_\n";
+ }
+ }
+} elsif ($#todo == -1) {
print STDERR "No tests to run\n";
exit(1);
- }
+}
my $suitestotal = $#todo + 1;
+
+Subunit::progress($suitestotal);
+Subunit::report_time(time());
+
my $i = 0;
$| = 1;
die("Received signal $signame");
};
-sub setup_env($)
+sub setup_env($$)
{
- my ($name) = @_;
+ my ($name, $prefix) = @_;
my $testenv_vars = undef;
} elsif (defined(get_running_env($envname))) {
$testenv_vars = get_running_env($envname);
if (not $target->check_env($testenv_vars)) {
+ print $target->getlog_env($testenv_vars);
$testenv_vars = undef;
}
} else {
SocketWrapper::set_default_iface($testenv_vars->{SOCKET_WRAPPER_DEFAULT_IFACE});
$ENV{SMB_CONF_PATH} = $testenv_vars->{SERVERCONFFILE};
} elsif ($option eq "client") {
- SocketWrapper::set_default_iface(6);
- write_clientconf($conffile, $testenv_vars);
+ SocketWrapper::set_default_iface(11);
+ write_clientconf($conffile, $clientdir, $testenv_vars);
$ENV{SMB_CONF_PATH} = $conffile;
} else {
die("Unknown option[$option] for envname[$envname]");
# This 'global' file needs to be empty when we start
unlink("$prefix_abs/dns_host_file");
-if ($opt_no_lazy_setup) {
- setup_env($_) foreach (keys %required_envs);
-}
-
if ($opt_testenv) {
my $testenv_name = $ENV{SELFTEST_TESTENV};
$testenv_name = $testenv_default unless defined($testenv_name);
- my $testenv_vars = setup_env($testenv_name);
+ my $testenv_vars = setup_env($testenv_name, $prefix);
+
+ die("Unable to setup environment $testenv_name") unless ($testenv_vars);
$ENV{PIDDIR} = $testenv_vars->{PIDDIR};
+ $ENV{ENVNAME} = $testenv_name;
my $envvarstr = exported_envvars_str($testenv_vars);
- my $term = ($ENV{TERMINAL} or "xterm");
- system("$term -e 'echo -e \"
+ my $term = ($ENV{TERMINAL} or "xterm -e");
+ system("$term 'echo -e \"
Welcome to the Samba4 Test environment '$testenv_name'
This matches the client environment used in make test
foreach (@todo) {
$i++;
my $cmd = $$_[2];
- $cmd =~ s/([\(\)])/\\$1/g;
my $name = $$_[0];
my $envname = $$_[1];
-
- my $envvars = setup_env($envname);
+
+ my $envvars = setup_env($envname, $prefix);
if (not defined($envvars)) {
- Subunit::skip_testsuite($name,
+ Subunit::start_testsuite($name);
+ Subunit::end_testsuite($name, "error",
"unable to set up environment $envname");
next;
}
- if ($$_[3] and $individual_tests and $individual_tests->{$name}) {
- my ($fh, $listid_file) = tempfile(UNLINK => 0);
- foreach (@{$individual_tests->{$name}}) {
- print $fh "$_\n";
+ # 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]) {
+ my ($fh, $listid_file) = tempfile(UNLINK => 0);
+ foreach my $test (@{$individual_tests->{$name}}) {
+ 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}});
}
- $cmd .= " --load-list=$listid_file";
}
- run_testsuite($envname, $name, $cmd, $i, $suitestotal,
- );
-
- if (defined($opt_analyse_cmd)) {
- system("$opt_analyse_cmd \"$name\"");
- }
+ run_testsuite($envname, $name, $cmd, $i, $suitestotal);
teardown_env($envname) if ($opt_resetup_env);
}
teardown_env($_) foreach (keys %running_envs);
-$target->stop();
-
my $failed = 0;
# if there were any valgrind failures, show them
git.samba.org / samba.git / blobdiff