summaryrefslogtreecommitdiff
path: root/selftest/output
diff options
context:
space:
mode:
Diffstat (limited to 'selftest/output')
-rw-r--r--selftest/output/buildfarm.pm12
-rw-r--r--selftest/output/html.pm19
-rw-r--r--selftest/output/plain.pm21
-rw-r--r--selftest/output/subunit.pm6
4 files changed, 13 insertions, 45 deletions
diff --git a/selftest/output/buildfarm.pm b/selftest/output/buildfarm.pm
index 701444359b..a9923e9fd1 100644
--- a/selftest/output/buildfarm.pm
+++ b/selftest/output/buildfarm.pm
@@ -87,24 +87,16 @@ sub end_testsuite($$$$$$)
sub start_test($$$)
{
- my ($self, $parents, $testname) = @_;
-
- if ($#$parents == -1) {
- $self->start_testsuite($testname);
- }
+ my ($self, $testname) = @_;
}
sub end_test($$$$$)
{
- my ($self, $parents, $testname, $result, $unexpected, $reason) = @_;
+ my ($self, $testname, $result, $unexpected, $reason) = @_;
if ($unexpected) {
$self->{test_output}->{$self->{NAME}} .= "UNEXPECTED($result): $testname\n";
}
-
- if ($#$parents == -1) {
- $self->end_testsuite($testname, $result, $unexpected, $reason);
- }
}
sub summary($)
diff --git a/selftest/output/html.pm b/selftest/output/html.pm
index d4d8204ea8..c3ed4ca5e7 100644
--- a/selftest/output/html.pm
+++ b/selftest/output/html.pm
@@ -94,6 +94,8 @@ sub start_testsuite($$)
{
my ($self, $name) = @_;
+ $self->{START_TIME} = $self->{last_time};
+
$self->{local_statistics} = {
success => 0,
skip => 0,
@@ -200,26 +202,15 @@ sub report_time($$)
sub start_test($$)
{
- my ($self, $parents, $testname) = @_;
-
- if ($#$parents == -1) {
- $self->{START_TIME} = $self->{last_time};
- $self->start_testsuite($testname);
- return;
- }
+ my ($self, $testname) = @_;
$self->{active_test} = $testname;
$self->{msg} = "";
}
-sub end_test($$$$$$)
+sub end_test($$$$)
{
- my ($self, $parents, $testname, $result, $unexpected, $reason) = @_;
-
- if ($#$parents == -1) {
- $self->end_testsuite($testname, $result, $unexpected, $reason);
- return;
- }
+ my ($self, $testname, $result, $unexpected, $reason) = @_;
print TEST "<tr>";
diff --git a/selftest/output/plain.pm b/selftest/output/plain.pm
index 9d92a3e071..2427136073 100644
--- a/selftest/output/plain.pm
+++ b/selftest/output/plain.pm
@@ -133,26 +133,13 @@ sub end_testsuite($$$$$)
sub start_test($$$)
{
- my ($self, $parents, $testname) = @_;
-
- if ($#$parents == -1) {
- $self->start_testsuite($testname);
- }
+ my ($self, $testname) = @_;
}
sub end_test($$$$$)
{
- my ($self, $parents, $testname, $result, $unexpected, $reason) = @_;
+ my ($self, $testname, $result, $unexpected, $reason) = @_;
- if ($#$parents == -1) {
- if ($result eq "skip") {
- $self->skip_testsuite($testname, $reason);
- } else {
- $self->end_testsuite($testname, $result, $unexpected, $reason);
- }
- return;
- }
-
my $append = "";
unless ($unexpected) {
@@ -167,9 +154,7 @@ sub end_test($$$$$)
return;
}
- my $fullname = join(".", @$parents).".$testname";
-
- $append = "UNEXPECTED($result): $testname ($fullname)\n";
+ $append = "UNEXPECTED($result): $testname\n";
$self->{test_output}->{$self->{NAME}} .= $append;
diff --git a/selftest/output/subunit.pm b/selftest/output/subunit.pm
index 5bce99f68f..3f2d0cf8a6 100644
--- a/selftest/output/subunit.pm
+++ b/selftest/output/subunit.pm
@@ -69,16 +69,16 @@ sub end_testsuite($$$$$$)
Subunit::end_test($name, $result, $reason);
}
-sub start_test($$$)
+sub start_test($$)
{
- my ($self, $parents, $testname) = @_;
+ my ($self, $testname) = @_;
Subunit::start_test($testname);
}
sub end_test($$$$$)
{
- my ($self, $parents, $testname, $result, $unexpected, $reason) = @_;
+ my ($self, $testname, $result, $unexpected, $reason) = @_;
if ($result eq "fail" and not $unexpected) { $result = "xfail"; }