use POSIX;
use Cwd qw(abs_path);
use lib "$RealBin";
-use Samba3;
-use Samba4;
+use Subunit qw(parse_results);
+use env::Samba3;
+use env::Samba4;
+use env::Windows;
use SocketWrapper;
my $opt_help = 0;
my $opt_resetup_env = undef;
my $opt_bindir = undef;
my $opt_no_lazy_setup = undef;
+my $opt_format = "plain";
my $srcdir = ".";
my $builddir = ".";
my $prefix = "./st";
-my $suitesfailed = [];
-my $start = time();
my @expected_failures = ();
my @skips = ();
my $statistics = {
+ START_TIME => time(),
+
SUITES_FAIL => 0,
SUITES_OK => 0,
SUITES_SKIPPED => 0,
TESTS_EXPECTED_OK => 0,
TESTS_UNEXPECTED_FAIL => 0,
TESTS_EXPECTED_FAIL => 0,
- TESTS_ERROR => 0
+ TESTS_ERROR => 0,
+ TESTS_SKIP => 0,
};
sub expecting_failure($)
sub getlog_env($);
-my $test_output = {};
-
-sub buildfarm_start_msg($)
-{
- my ($state) = @_;
- my $out = "";
-
- $out .= "--==--==--==--==--==--==--==--==--==--==--\n";
- $out .= "Running test $state->{NAME} (level 0 stdout)\n";
- $out .= "--==--==--==--==--==--==--==--==--==--==--\n";
- $out .= scalar(localtime())."\n";
- $out .= "SELFTEST RUNTIME: " . ($state->{START} - $start) . "s\n";
- $out .= "NAME: $state->{NAME}\n";
- $out .= "CMD: $state->{CMD}\n";
-
- $test_output->{$state->{NAME}} = "";
-
- print $out;
-}
-
-sub buildfarm_output_msg($$)
-{
- my ($state, $output) = @_;
-
- $test_output->{$state->{NAME}} .= $output;
-}
-
-sub buildfarm_end_msg($$$)
-{
- my ($state, $expected_ret, $ret) = @_;
- my $out = "";
-
- $out .= "TEST RUNTIME: " . (time() - $state->{START}) . "s\n";
-
- if ($ret == $expected_ret) {
- $out .= "ALL OK\n";
- } else {
- $out .= "ERROR: $ret";
- $out .= $test_output->{$state->{NAME}};
- }
-
- $out .= "PCAP FILE: $state->{PCAP_FILE}\n" if defined($state->{PCAP_FILE});
-
- $out .= getlog_env($state->{ENVNAME});
-
- $out .= "==========================================\n";
- if ($ret == $expected_ret) {
- $out .= "TEST PASSED: $state->{NAME}\n";
- } else {
- $out .= "TEST FAILED: $state->{NAME} (status $ret)\n";
- }
- $out .= "==========================================\n";
-
- print $out;
-}
-
-my $buildfarm_msg_ops = {
- start_msg => \&buildfarm_start_msg,
- output_msg => \&buildfarm_output_msg,
- end_msg => \&buildfarm_end_msg
-};
-
-sub plain_output_msg($$);
-
-sub plain_start_msg($)
-{
- my ($state) = @_;
- my $out = "";
-
- $out .= "[$state->{INDEX}/$state->{TOTAL} in " . ($state->{START} - $start) . "s";
- $out .= ", ".($#$suitesfailed+1)." errors" if ($#$suitesfailed+1 > 0);
- $out .= "] $state->{NAME}\n";
-
- $test_output->{$state->{NAME}} = "" unless $opt_verbose;
-
- plain_output_msg($state, "CMD: $state->{CMD}\n");
-
- print $out;
-}
-
-sub plain_output_msg($$)
-{
- my ($state, $output) = @_;
-
- if ($opt_verbose) {
- print $output;
- } else {
- $test_output->{$state->{NAME}} .= $output;
- }
-}
-
-sub plain_end_msg($$$)
-{
- my ($state, $expected_ret, $ret) = @_;
- my $out = "";
-
- if ($ret != $expected_ret) {
- plain_output_msg($state, "ERROR: $ret\n");
- }
-
- if ($ret != $expected_ret and ($opt_immediate or $opt_one) and not $opt_verbose) {
- $out .= $test_output->{$state->{NAME}};
- }
-
- if (not $opt_socket_wrapper_keep_pcap and defined($state->{PCAP_FILE})) {
- $out .= "PCAP FILE: $state->{PCAP_FILE}\n";
- }
-
- $out .= getlog_env($state->{ENVNAME});
-
- print $out;
-}
-
-my $plain_msg_ops = {
- start_msg => \&plain_start_msg,
- output_msg => \&plain_output_msg,
- end_msg => \&plain_end_msg
-};
-
sub setup_pcap($)
{
my ($state) = @_;
$state->{PCAP_FILE} = undef;
}
-sub run_test($$$$$$)
+sub run_testsuite($$$$$$)
{
my ($envname, $name, $cmd, $i, $totalsuites, $msg_ops) = @_;
- my $expected_ret = 1;
- my $open_tests = {};
my $msg_state = {
ENVNAME => $envname,
NAME => $name,
CMD => $cmd,
INDEX => $i,
TOTAL => $totalsuites,
- START => time()
+ START_TIME => time()
};
setup_pcap($msg_state);
- $msg_ops->{start_msg}->($msg_state);
-
open(RESULT, "$cmd 2>&1|");
- while (<RESULT>) {
- $msg_ops->{output_msg}->($msg_state, $_);
- if (/^test: (.+)\n/) {
- $open_tests->{$1} = 1;
- } elsif (/^(success|failure|skip|error): (.*?)( \[)?\n/) {
- my $result = $1;
- if ($1 eq "success") {
- delete $open_tests->{$2};
- if (expecting_failure("$name/$2")) {
- $statistics->{TESTS_UNEXPECTED_OK}++;
- } else {
- $statistics->{TESTS_EXPECTED_OK}++;
- }
- } elsif ($1 eq "failure") {
- delete $open_tests->{$2};
- if (expecting_failure("$name/$2")) {
- $statistics->{TESTS_EXPECTED_FAIL}++;
- $expected_ret = 0;
- } else {
- print "n:$name/$2\n";
- $statistics->{TESTS_UNEXPECTED_FAIL}++;
- }
- } elsif ($1 eq "skip") {
- delete $open_tests->{$2};
- } elsif ($1 eq "error") {
- $statistics->{TESTS_ERROR}++;
- delete $open_tests->{$2};
- }
- }
- }
- foreach (keys %$open_tests) {
- $msg_ops->{output_msg}->($msg_state, "$_ was started but never finished!\n");
- $statistics->{TESTS_ERROR}++;
- }
+ $msg_ops->start_testsuite($msg_state);
+
+ my $expected_ret = parse_results(
+ $msg_ops, $msg_state, $statistics, *RESULT, \&expecting_failure);
+
my $ret = close(RESULT);
- cleanup_pcap($msg_state, $expected_ret, $ret);
+ cleanup_pcap($msg_state, $expected_ret, $ret);
- $msg_ops->{end_msg}->($msg_state, $expected_ret, $ret);
+ $msg_ops->end_testsuite($msg_state, $expected_ret, $ret,
+ getlog_env($msg_state->{ENVNAME}));
+
+ if (not $opt_socket_wrapper_keep_pcap and
+ defined($msg_state->{PCAP_FILE})) {
+ $msg_ops->output_msg($msg_state,
+ "PCAP FILE: $msg_state->{PCAP_FILE}\n");
+ }
if ($ret != $expected_ret) {
- push(@$suitesfailed, $name);
$statistics->{SUITES_FAIL}++;
exit(1) if ($opt_one);
} else {
--expected-failures=FILE specify list of tests that is guaranteed to fail
Samba4 Specific:
- --ldap=openldap|fedora back smbd onto specified ldap server
+ --ldap=openldap|fedora-ds back smbd onto specified ldap server
Samba3 Specific:
--bindir=PATH path to binaries
'no-lazy-setup' => \$opt_no_lazy_setup,
'resetup-environment' => \$opt_resetup_env,
'bindir:s' => \$opt_bindir,
+ 'format=s' => \$opt_format,
);
exit(1) if (not $result);
# Backwards compatibility:
if (defined($ENV{TEST_LDAP}) and $ENV{TEST_LDAP} eq "yes") {
if (defined($ENV{FEDORA_DS_PREFIX})) {
- $ldap = "fedora";
+ $ldap = "fedora-ds";
} else {
$ldap = "openldap";
}
die("using '/' as absolute prefix isn't allowed") unless $prefix_abs ne "/";
$ENV{PREFIX} = $prefix;
+$ENV{PREFIX_ABS} = $prefix_abs;
$ENV{SRCDIR} = $srcdir;
+$ENV{SRCDIR_ABS} = $srcdir_abs;
my $tls_enabled = not $opt_quick;
-my $from_build_farm = (defined($ENV{RUN_FROM_BUILD_FARM}) and
- ($ENV{RUN_FROM_BUILD_FARM} eq "yes"));
+if (defined($ENV{RUN_FROM_BUILD_FARM}) and
+ ($ENV{RUN_FROM_BUILD_FARM} eq "yes")) {
+ $opt_format = "buildfarm";
+}
$ENV{TLS_ENABLED} = ($tls_enabled?"yes":"no");
$ENV{LD_LDB_MODULE_PATH} = "$old_pwd/bin/modules/ldb";
} else {
$ENV{LD_LIBRARY_PATH} = "$old_pwd/bin/shared";
}
-$ENV{PKG_CONFIG_PATH} = "$old_pwd/bin/pkgconfig:$ENV{PKG_CONFIG_PATH}";
+if (defined($ENV{PKG_CONFIG_PATH})) {
+ $ENV{PKG_CONFIG_PATH} = "$old_pwd/bin/pkgconfig:$ENV{PKG_CONFIG_PATH}";
+} else {
+ $ENV{PKG_CONFIG_PATH} = "$old_pwd/bin/pkgconfig";
+}
$ENV{PATH} = "$old_pwd/bin:$ENV{PATH}";
# ensure any one smbtorture call doesn't run too long
push (@torture_options, "--maximum-runtime=$torture_maxtime");
push (@torture_options, "--target=$opt_target");
-push (@torture_options, "--option=torture:progress=no") if ($from_build_farm);
+push (@torture_options, "--basedir=$prefix");
+push (@torture_options, "--option=torture:progress=no") if ($opt_format eq "buildfarm");
push (@torture_options, "--format=subunit");
push (@torture_options, "--option=torture:quick=yes") if ($opt_quick);
"DC_PASSWORD",
# misc stuff
- "KRB5_CONFIG"
+ "KRB5_CONFIG",
+ "WINBINDD_SOCKET_DIR"
);
sub setup_env($)
}
my $msg_ops;
-if ($from_build_farm) {
- $msg_ops = $buildfarm_msg_ops;
+if ($opt_format eq "buildfarm") {
+ require output::buildfarm;
+ $msg_ops = new output::buildfarm();
+} elsif ($opt_format eq "plain") {
+ require output::plain;
+ $msg_ops = new output::plain($opt_verbose, $opt_immediate, $statistics);
+} elsif ($opt_format eq "html") {
+ require output::html;
+ mkdir("test-results", 0777);
+ $msg_ops = new output::html("test-results", $statistics);
} else {
- $msg_ops = $plain_msg_ops;
+ die("Invalid output format '$opt_format'");
}
if ($opt_no_lazy_setup) {
my $envname = $$_[1];
if (skip($name)) {
- print "SKIPPED: $name\n";
+ $msg_ops->skip_testsuite($name);
$statistics->{SUITES_SKIPPED}++;
next;
}
my $envvars = setup_env($envname);
if (not defined($envvars)) {
- push(@$suitesfailed, $name);
$statistics->{SUITES_FAIL}++;
$statistics->{TESTS_ERROR}++;
- print "FAIL: $name (ENV[$envname] not available!)\n";
+ $msg_ops->missing_env($name, $envname);
next;
}
- run_test($envname, $name, $cmd, $i, $suitestotal, $msg_ops);
+ run_testsuite($envname, $name, $cmd, $i, $suitestotal, $msg_ops);
if (defined($opt_analyse_cmd)) {
system("$opt_analyse_cmd \"$name\"");
$target->stop();
-my $end = time();
-my $duration = ($end-$start);
-my $numfailed = $#$suitesfailed+1;
-if ($numfailed == 0) {
- my $ok = $statistics->{TESTS_EXPECTED_OK} +
- $statistics->{TESTS_EXPECTED_FAIL};
- print "ALL OK ($ok tests in $statistics->{SUITES_OK} testsuites)\n";
-} else {
- unless ($from_build_farm) {
- if (not $opt_immediate and not $opt_verbose) {
- foreach (@$suitesfailed) {
- print "===============================================================================\n";
- print "FAIL: $_\n";
- print $test_output->{$_};
- print "\n";
- }
- }
-
- print "FAILED ($statistics->{TESTS_UNEXPECTED_FAIL} failures and $statistics->{TESTS_ERROR} errors in $statistics->{SUITES_FAIL} testsuites)\n";
- }
-}
+$statistics->{END_TIME} = time();
+my $duration = ($statistics->{END_TIME}-$statistics->{START_TIME});
+$msg_ops->summary();
print "DURATION: $duration seconds\n";
my $failed = 0;
}
}
-if ($from_build_farm) {
- print "TEST STATUS: $numfailed\n";
+if ($opt_format eq "buildfarm") {
+ print "TEST STATUS: $statistics->{SUITES_FAIL}\n";
}
-exit $numfailed;
+exit $statistics->{SUITES_FAIL};
git.samba.org / gd / samba-autobuild / .git / blobdiff