r26556: Make Fedora DS consistant use FEDORA_DS_ROOT, now we use OPENLDAP_ROOT.

[samba.git] / source4 / selftest / selftest.pl

diff --git a/source4/selftest/selftest.pl b/source4/selftest/selftest.pl
index 456b483f072091bc896a4b397f29467a918f9b24..740120504170215252d41dcef36f09024bad0ab2 100755 (executable)
--- a/source4/selftest/selftest.pl
+++ b/source4/selftest/selftest.pl
@@ -165,11 +165,7 @@ my @includes = ();
 my @excludes = ();
 
 my $statistics = {
-       START_TIME => time(),
-
        SUITES_FAIL => 0,
-       SUITES_OK => 0,
-       SUITES_SKIPPED => 0,
 
        TESTS_UNEXPECTED_OK => 0,
        TESTS_EXPECTED_OK => 0,
@@ -210,72 +206,69 @@ sub getlog_env($);
 
 sub setup_pcap($)
 {
-       my ($state) = @_;
+       my ($state, $name) = @_;
 
        return unless ($opt_socket_wrapper_pcap);
        return unless defined($ENV{SOCKET_WRAPPER_PCAP_DIR});
 
-       my $fname = sprintf("t%03u_%s", $state->{INDEX}, $state->{NAME});
+       my $fname = $name;
        $fname =~ s%[^abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789\-]%_%g;
 
-       $state->{PCAP_FILE} = "$ENV{SOCKET_WRAPPER_PCAP_DIR}/$fname.pcap";
+       my $pcap_file = "$ENV{SOCKET_WRAPPER_PCAP_DIR}/$fname.pcap";
+
+       SocketWrapper::setup_pcap($pcap_file);
 
-       SocketWrapper::setup_pcap($state->{PCAP_FILE});
+       return $pcap_file;
 }
 
 sub cleanup_pcap($$$)
 {
-       my ($state, $expected_ret, $ret) = @_;
+       my ($pcap_file, $expected_ret, $ret) = @_;
 
        return unless ($opt_socket_wrapper_pcap);
        return if ($opt_socket_wrapper_keep_pcap);
        return unless ($expected_ret == $ret);
-       return unless defined($state->{PCAP_FILE});
+       return unless defined($pcap_file);
 
-       unlink($state->{PCAP_FILE});
-       $state->{PCAP_FILE} = undef;
+       unlink($pcap_file);
 }
 
-sub run_testsuite($$$$$$$)
+sub run_testsuite($$$$$$)
 {
-       my ($envname, $envvars, $name, $cmd, $i, $totalsuites, $msg_ops) = @_;
-       my $msg_state = {
-               ENVNAME => $envname,
-               ENVVARS => $envvars,
-               NAME => $name,
-               CMD     => $cmd,
-               INDEX   => $i,
-               TOTAL   => $totalsuites,
-               START_TIME      => time()
-       };
-
-       setup_pcap($msg_state);
+       my ($envname, $name, $cmd, $i, $totalsuites, $msg_ops) = @_;
+       my $pcap_file = setup_pcap($name);
 
-       open(RESULT, "$cmd 2>&1|");
-       $msg_ops->start_testsuite($name, $msg_state);
+       $msg_ops->start_test([], $name);
 
+       open(RESULT, "$cmd 2>&1|");
        my $expected_ret = parse_results(
-               $msg_ops, $msg_state, $statistics, *RESULT, \&expecting_failure);
+               $msg_ops, $statistics, *RESULT, \&expecting_failure, [$name]);
+
+       my $envlog = getlog_env($envname);
+       $msg_ops->output_msg("ENVLOG: $envlog\n") if ($envlog ne "");
+
+       $msg_ops->output_msg("CMD: $cmd\n");
 
        my $ret = close(RESULT);
        $ret = 0 unless $ret == 1;
 
-       cleanup_pcap($msg_state, $expected_ret, $ret);
+       if ($ret == 1) {
+               $msg_ops->end_test([], $name, "success", $expected_ret != $ret, undef);
+       } else {
+               $msg_ops->end_test([], $name, "failure", $expected_ret != $ret, 
+                                              "Returned $ret");
+       }
 
-       $msg_ops->end_testsuite($name, $msg_state, $expected_ret, $ret,
-                                                       getlog_env($msg_state->{ENVNAME}));
+       cleanup_pcap($pcap_file, $expected_ret, $ret);
 
        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");
+               defined($pcap_file)) {
+               $msg_ops->output_msg("PCAP FILE: $pcap_file\n");
        }
 
        if ($ret != $expected_ret) {
                $statistics->{SUITES_FAIL}++;
                exit(1) if ($opt_one);
-       } else {
-               $statistics->{SUITES_OK}++;
        }
 
        return ($ret == $expected_ret);
@@ -363,7 +356,7 @@ my $old_pwd = "$RealBin/..";
 
 # Backwards compatibility:
 if (defined($ENV{TEST_LDAP}) and $ENV{TEST_LDAP} eq "yes") {
-       if (defined($ENV{FEDORA_DS_PREFIX})) {
+       if (defined($ENV{FEDORA_DS_ROOT})) {
                $ldap = "fedora-ds";
        } else {
                $ldap = "openldap";
@@ -599,13 +592,22 @@ if ($#testlists == -1) {
        die("No testlists specified");
 }
 
+my @available = ();
+foreach my $fn (@testlists) {
+       foreach (read_testlist($fn)) {
+               my $name = $$_[0];
+               next if (@includes and not find_in_list(\@includes, $name));
+               push (@available, $_);
+       }
+}
+
 my $msg_ops;
 if ($opt_format eq "buildfarm") {
        require output::buildfarm;
        $msg_ops = new output::buildfarm($statistics);
 } elsif ($opt_format eq "plain") {
        require output::plain;
-       $msg_ops = new output::plain("$prefix/summary", $opt_verbose, $opt_immediate, $statistics);
+       $msg_ops = new output::plain("$prefix/summary", $opt_verbose, $opt_immediate, $statistics, $#available+1);
 } elsif ($opt_format eq "html") {
        require output::html;
        mkdir("test-results", 0777);
@@ -614,17 +616,14 @@ if ($opt_format eq "buildfarm") {
        die("Invalid output format '$opt_format'");
 }
 
-foreach my $fn (@testlists) {
-       foreach (read_testlist($fn)) {
-               my $name = $$_[0];
-               next if (@includes and not find_in_list(\@includes, $name));
-               my $skipreason = skip($name);
-               if ($skipreason) {
-                       $msg_ops->skip_testsuite($name, $skipreason);
-                       $statistics->{SUITES_SKIPPED}++;
-               } else {
-                       push(@todo, $_); 
-               }
+
+foreach (@available) {
+       my $name = $$_[0];
+       my $skipreason = skip($name);
+       if ($skipreason) {
+               $msg_ops->skip_testsuite($name, $skipreason);
+       } else {
+               push(@todo, $_); 
        }
 }
 
@@ -782,12 +781,11 @@ $envvarstr
                
                my $envvars = setup_env($envname);
                if (not defined($envvars)) {
-                       $statistics->{SUITES_SKIPPED}++;
                        $msg_ops->skip_testsuite($name, "unable to set up environment $envname");
                        next;
                }
 
-               run_testsuite($envname, $envvars, $name, $cmd, $i, $suitestotal, 
+               run_testsuite($envname, $name, $cmd, $i, $suitestotal, 
                              $msg_ops);
 
                if (defined($opt_analyse_cmd)) {
@@ -804,10 +802,7 @@ teardown_env($_) foreach (keys %running_envs);
 
 $target->stop();
 
-$statistics->{END_TIME} = time();
-my $duration = ($statistics->{END_TIME}-$statistics->{START_TIME});
 $msg_ops->summary();
-print "DURATION: $duration seconds\n";
 
 my $failed = 0;