waf: added top level build rules

[samba.git] / selftest / Subunit.pm

diff --git a/selftest/Subunit.pm b/selftest/Subunit.pm
index 5ee8743c6c5828eb9768ccbf77f5aaf8dd157345..1cc0e721696673b9c21a873fb03d4acd618767de 100644 (file)
--- a/selftest/Subunit.pm
+++ b/selftest/Subunit.pm
@@ -19,93 +19,9 @@ use POSIX;
 
 require Exporter;
 @ISA = qw(Exporter);
-@EXPORT_OK = qw(parse_results);
 
 use strict;
 
-sub parse_results($$$$)
-{
-       my ($msg_ops, $statistics, $fh, $open_tests) = @_;
-       my $unexpected_ok = 0;
-       my $expected_fail = 0;
-       my $unexpected_fail = 0;
-       my $unexpected_err = 0;
-       my $orig_open_len = $#$open_tests;
-
-       while(<$fh>) {
-               if (/^test: (.+)\n/) {
-                       $msg_ops->control_msg($_);
-                       $msg_ops->start_test($open_tests, $1);
-                       push (@$open_tests, $1);
-               } elsif (/^time: (\d+)-(\d+)-(\d+) (\d+):(\d+):(\d+)Z\n/) {
-                       $msg_ops->report_time(mktime($6, $5, $4, $3, $2, $1));
-               } elsif (/^(success|successful|failure|fail|skip|knownfail|error|xfail): (.*?)( \[)?([ \t]*)\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, $result, 1, "reason interrupted");
-                                       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, $result, 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, $result, 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, $result, 1, $reason);
-                               $unexpected_fail++;
-                       } elsif ($result eq "skip") {
-                               $statistics->{TESTS_SKIP}++;
-                               my $last = pop(@$open_tests);
-                               if (defined($last) and $last ne $testname) {
-                                       push (@$open_tests, $testname);
-                               }
-                               $msg_ops->end_test($testname, $result, 0, $reason);
-                       } elsif ($result eq "error") {
-                               $statistics->{TESTS_ERROR}++;
-                               pop(@$open_tests); #FIXME: Check that popped value == $testname
-                               $msg_ops->end_test($testname, $result, 1, $reason);
-                               $unexpected_err++;
-                       }
-               } else {
-                       $msg_ops->output_msg($_);
-               }
-       }
-
-       while ($#$open_tests > $orig_open_len) {
-               $msg_ops->end_test($open_tests, pop(@$open_tests), "error", 1,
-                                  "was started but never finished!");
-               $statistics->{TESTS_ERROR}++;
-               $unexpected_err++;
-       }
-
-       return 1 if $unexpected_err > 0;
-       return 1 if $unexpected_fail > 0;
-       return 1 if $unexpected_ok > 0 and $expected_fail > 0;
-       return 0 if $unexpected_ok > 0 and $expected_fail == 0;
-       return 0 if $expected_fail > 0;
-       return 1;
-}
-
 sub start_test($)
 {
        my ($testname) = @_;
@@ -118,8 +34,9 @@ sub end_test($$;$)
        my $result = shift;
        my $reason = shift;
        if ($reason) {
-               print "$result: $name [";
-               print "$reason";
+               print "$result: $name [\n";
+               print $reason;
+               if (substr($reason, -1, 1) ne "\n") { print "\n"; }
                print "]\n";
        } else {
                print "$result: $name\n";
@@ -130,7 +47,65 @@ sub report_time($)
 {
        my ($time) = @_;
        my ($sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst) = localtime($time);
-       printf "time: %04d-%02d-%02d %02d:%02d:%02dZ\n", $year+1900, $mon, $mday, $hour, $min, $sec;
+       $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()
+{
+       print "progress: pop\n";
+}
+
+sub progress_push()
+{
+       print "progress: push\n";
+}
+
+sub progress($;$)
+{
+       my ($count, $whence) = @_;
+
+       unless(defined($whence)) {
+               $whence = "";
+       }
+
+       print "progress: $whence$count\n";
+}
+
+# The following are Samba extensions:
+
+sub start_testsuite($)
+{
+       my ($name) = @_;
+       print "testsuite: $name\n";
+}
+
+sub skip_testsuite($;$)
+{
+       my ($name, $reason) = @_;
+       if ($reason) {
+               print "skip-testsuite: $name [\n$reason\n]\n";
+       } else {
+               print "skip-testsuite: $name\n";
+       }
+}
+
+sub end_testsuite($$;$)
+{
+       my $name = shift;
+       my $result = shift;
+       my $reason = shift;
+       if ($reason) {
+               print "testsuite-$result: $name [\n";
+               print "$reason\n";
+               print "]\n";
+       } else {
+               print "testsuite-$result: $name\n";
+       }
 }
 
 1;