diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2010-09-13 23:56:26 +0200 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2010-09-14 10:54:28 +0200 |
commit | d3960f6b406272cc37820fad04aed6ddfd4e6cce (patch) | |
tree | eb80110d759fa3db8f07688933e2492eece7c29a /selftest/Subunit/Filter.pm | |
parent | 49411fa1079fc78cba4751d57a3c76096fc1b772 (diff) | |
download | samba-d3960f6b406272cc37820fad04aed6ddfd4e6cce.tar.gz samba-d3960f6b406272cc37820fad04aed6ddfd4e6cce.tar.bz2 samba-d3960f6b406272cc37820fad04aed6ddfd4e6cce.zip |
subunit.pm: Simplify subunit handling in perl.
Diffstat (limited to 'selftest/Subunit/Filter.pm')
-rw-r--r-- | selftest/Subunit/Filter.pm | 122 |
1 files changed, 3 insertions, 119 deletions
diff --git a/selftest/Subunit/Filter.pm b/selftest/Subunit/Filter.pm index 4a94f258f1..1c48426995 100644 --- a/selftest/Subunit/Filter.pm +++ b/selftest/Subunit/Filter.pm @@ -7,59 +7,15 @@ package Subunit::Filter; use strict; -sub read_test_regexes($) -{ - my ($name) = @_; - my @ret = (); - open(LF, "<$name") or die("unable to read $name: $!"); - while (<LF>) { - chomp; - next if (/^#/); - next if (/^$/); - if (/^(.*?)([ \t]+)\#([\t ]*)(.*?)$/) { - push (@ret, [$1, $4]); - } else { - s/^(.*?)([ \t]+)\#([\t ]*)(.*?)$//; - push (@ret, [$_, undef]); - } - } - close(LF); - return @ret; -} - -sub find_in_list($$) -{ - my ($list, $fullname) = @_; - - foreach (@$list) { - if ($fullname =~ /$$_[0]/) { - return ($$_[1]) if ($$_[1]); - return ""; - } - } - - return undef; -} - sub control_msg() { # We regenerate control messages, so ignore this } -sub report_time($$) -{ - my ($self, $time) = @_; - Subunit::report_time($time); -} - sub output_msg($$) { my ($self, $msg) = @_; - unless(defined($self->{output})) { - print $msg; - } else { - $self->{output}.=$msg; - } + print $msg; } sub start_test($$) @@ -70,10 +26,6 @@ sub start_test($$) $testname = $self->{prefix}.$testname; } - if ($self->{strip_ok_output}) { - $self->{output} = ""; - } - Subunit::start_test($testname); } @@ -85,36 +37,6 @@ sub end_test($$$$$) $testname = $self->{prefix}.$testname; } - if (($result eq "fail" or $result eq "failure") and not $unexpected) { - $result = "xfail"; - $self->{xfail_added}++; - $self->{total_xfail}++; - } - my $xfail_reason = find_in_list($self->{expected_failures}, $testname); - if (defined($xfail_reason) and ($result eq "fail" or $result eq "failure")) { - $result = "xfail"; - $self->{xfail_added}++; - $self->{total_xfail}++; - $reason .= $xfail_reason; - } - - if ($result eq "fail" or $result eq "failure") { - $self->{fail_added}++; - $self->{total_fail}++; - } - - if ($result eq "error") { - $self->{error_added}++; - $self->{total_error}++; - } - - if ($self->{strip_ok_output}) { - unless ($result eq "success" or $result eq "xfail" or $result eq "skip") { - print $self->{output} - } - } - $self->{output} = undef; - Subunit::end_test($testname, $result, $reason); } @@ -128,57 +50,19 @@ sub start_testsuite($;$) { my ($self, $name) = @_; Subunit::start_testsuite($name); - - $self->{error_added} = 0; - $self->{fail_added} = 0; - $self->{xfail_added} = 0; } sub end_testsuite($$;$) { my ($self, $name, $result, $reason) = @_; - my $xfail = 0; - - $xfail = 1 if ($self->{xfail_added} > 0); - $xfail = 0 if ($self->{fail_added} > 0); - $xfail = 0 if ($self->{error_added} > 0); - - if ($xfail and ($result eq "fail" or $result eq "failure")) { - $result = "xfail"; - } - - if ($self->{fail_added} > 0 and $result ne "failure") { - $result = "failure"; - $reason = "Subunit/Filer Reason" unless defined($reason); - $reason .= "\n failures[$self->{fail_added}]"; - } - - if ($self->{error_added} > 0 and $result ne "error") { - $result = "error"; - $reason = "Subunit/Filer Reason" unless defined($reason); - $reason .= "\n errors[$self->{error_added}]"; - } - Subunit::end_testsuite($name, $result, $reason); } -sub testsuite_count($$) -{ - my ($self, $count) = @_; - Subunit::testsuite_count($count); -} - sub new { - my ($class, $prefix, $expected_failures, $strip_ok_output) = @_; + my ($class, $prefix) = @_; - my $self = { + my $self = { prefix => $prefix, - expected_failures => $expected_failures, - strip_ok_output => $strip_ok_output, - xfail_added => 0, - total_xfail => 0, - total_error => 0, - total_fail => 0 }; bless($self, $class); } |