s3:smbd: use passed in ev in smbd_smb2_query_directory_send()

[garming/samba-autobuild/.git] / selftest / Subunit.pm

diff --git a/selftest/Subunit.pm b/selftest/Subunit.pm
index 7a352bd71b0084c945e802747651a19963437d82..07f4b8ff97ddb22853261de7515be2f500a3638a 100644 (file)
--- a/selftest/Subunit.pm
+++ b/selftest/Subunit.pm
@@ -16,109 +16,13 @@
 
 package Subunit;
 use POSIX;
+use Time::HiRes;
 
 require Exporter;
 @ISA = qw(Exporter);
-@EXPORT_OK = qw(parse_results);
 
 use strict;
 
-sub parse_results($$$)
-{
-       my ($msg_ops, $statistics, $fh) = @_;
-       my $expected_fail = 0;
-       my $open_tests = [];
-
-       while(<$fh>) {
-               if (/^test: (.+)\n/) {
-                       $msg_ops->control_msg($_);
-                       $msg_ops->start_test($1);
-                       push (@$open_tests, $1);
-               } elsif (/^time: (\d+)-(\d+)-(\d+) (\d+):(\d+):(\d+)\n/) {
-                       $msg_ops->report_time(mktime($6, $5, $4, $3, $2-1, $1-1900));
-               } elsif (/^(success|successful|failure|fail|skip|knownfail|error|xfail|skip-testsuite|testsuite-failure|testsuite-xfail|testsuite-success|testsuite-error): (.*?)( \[)?([ \t]*)( multipart)?\n/) {
-                       $msg_ops->control_msg($_);
-                       my $result = $1;
-                       my $testname = $2;
-                       my $reason = undef;
-                       if ($3) {
-                               $reason = "";
-                               # reason may be specified in next lines
-                               my $terminated = 0;
-                               while(<$fh>) {
-                                       $msg_ops->control_msg($_);
-                                       if ($_ eq "]\n") { $terminated = 1; last; } else { $reason .= $_; }
-                               }
-                               
-                               unless ($terminated) {
-                                       $statistics->{TESTS_ERROR}++;
-                                       $msg_ops->end_test($testname, "error", 1,
-                                                              "reason ($result) interrupted\n");
-                                       return 1;
-                               }
-                       }
-                       if ($result eq "success" or $result eq "successful") {
-                               pop(@$open_tests); #FIXME: Check that popped value == $testname 
-                               $statistics->{TESTS_EXPECTED_OK}++;
-                               $msg_ops->end_test($testname, "success", 0, $reason);
-                       } elsif ($result eq "xfail" or $result eq "knownfail") {
-                               pop(@$open_tests); #FIXME: Check that popped value == $testname
-                               $statistics->{TESTS_EXPECTED_FAIL}++;
-                               $msg_ops->end_test($testname, "xfail", 0, $reason);
-                               $expected_fail++;
-                       } elsif ($result eq "failure" or $result eq "fail") {
-                               pop(@$open_tests); #FIXME: Check that popped value == $testname
-                               $statistics->{TESTS_UNEXPECTED_FAIL}++;
-                               $msg_ops->end_test($testname, "failure", 1, $reason);
-                       } elsif ($result eq "skip") {
-                               $statistics->{TESTS_SKIP}++;
-                               # Allow tests to be skipped without prior announcement of test
-                               my $last = pop(@$open_tests);
-                               if (defined($last) and $last ne $testname) {
-                                       push (@$open_tests, $testname);
-                               }
-                               $msg_ops->end_test($testname, "skip", 0, $reason);
-                       } elsif ($result eq "error") {
-                               $statistics->{TESTS_ERROR}++;
-                               pop(@$open_tests); #FIXME: Check that popped value == $testname
-                               $msg_ops->end_test($testname, "error", 1, $reason);
-                       } elsif ($result eq "skip-testsuite") {
-                               $msg_ops->skip_testsuite($testname);
-                       } elsif ($result eq "testsuite-success") {
-                               $msg_ops->end_testsuite($testname, "success", $reason);
-                       } elsif ($result eq "testsuite-failure") {
-                               $msg_ops->end_testsuite($testname, "failure", $reason);
-                       } elsif ($result eq "testsuite-xfail") {
-                               $msg_ops->end_testsuite($testname, "xfail", $reason);
-                       } elsif ($result eq "testsuite-error") {
-                               $msg_ops->end_testsuite($testname, "error", $reason);
-                       } 
-               } elsif (/^testsuite: (.*)\n/) {
-                       $msg_ops->start_testsuite($1);
-               } else {
-                       $msg_ops->output_msg($_);
-               }
-       }
-
-       while ($#$open_tests+1 > 0) {
-               $msg_ops->end_test(pop(@$open_tests), "error", 1,
-                                  "was started but never finished!\n");
-               $statistics->{TESTS_ERROR}++;
-       }
-
-       # if the Filter module is in use, it will have the right counts
-       if (defined($msg_ops->{total_error})) {
-               $statistics->{TESTS_ERROR} = $msg_ops->{total_error};
-               $statistics->{TESTS_UNEXPECTED_FAIL} = $msg_ops->{total_fail};
-               $statistics->{TESTS_EXPECTED_FAIL} = $msg_ops->{total_xfail};
-       }
-
-       return 1 if $statistics->{TESTS_ERROR} > 0;
-       return 1 if $statistics->{TESTS_UNEXPECTED_FAIL} > 0;
-
-       return 0;
-}
-
 sub start_test($)
 {
        my ($testname) = @_;
@@ -140,39 +44,17 @@ sub end_test($$;$)
        }
 }
 
-sub skip_test($;$)
-{
-       my $name = shift;
-       my $reason = shift;
-       end_test($name, "skip", $reason);
-}
-
-sub fail_test($;$)
-{
-       my $name = shift;
-       my $reason = shift;
-       end_test($name, "fail", $reason);
-}
-
-sub success_test($;$)
-{
-       my $name = shift;
-       my $reason = shift;
-       end_test($name, "success", $reason);
-}
-
-sub xfail_test($;$)
-{
-       my $name = shift;
-       my $reason = shift;
-       end_test($name, "xfail", $reason);
-}
-
-sub report_time($)
+sub report_time()
 {
        my ($time) = @_;
-       my ($sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst) = localtime($time);
-       printf "time: %04d-%02d-%02d %02d:%02d:%02d\n", $year+1900, $mon+1, $mday, $hour, $min, $sec;
+       $time = Time::HiRes::time() unless (defined($time));
+       my ($sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst) = gmtime($time);
+       $sec = ($time - int($time) + $sec);
+       my $msg = sprintf("%f", $sec);
+       if (substr($msg, 1, 1) eq ".") {
+               $msg = "0" . $msg;
+       }
+       printf "time: %04d-%02d-%02d %02d:%02d:%s\n", $year+1900, $mon+1, $mday, $hour, $min, $msg;
 }
 
 sub progress_pop()