summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--selftest/Subunit.pm8
-rw-r--r--selftest/Subunit/Filter.pm11
-rwxr-xr-xselftest/filter-subunit.pl2
-rwxr-xr-xselftest/format-subunit.pl2
4 files changed, 6 insertions, 17 deletions
diff --git a/selftest/Subunit.pm b/selftest/Subunit.pm
index 71d65f0ee5..16aab73926 100644
--- a/selftest/Subunit.pm
+++ b/selftest/Subunit.pm
@@ -23,14 +23,14 @@ require Exporter;
use strict;
-sub parse_results($$$$)
+sub parse_results($$$)
{
- my ($msg_ops, $statistics, $fh, $open_tests) = @_;
+ my ($msg_ops, $statistics, $fh) = @_;
my $unexpected_ok = 0;
my $expected_fail = 0;
my $unexpected_fail = 0;
my $unexpected_err = 0;
- my $orig_open_len = $#$open_tests;
+ my $open_tests = [];
while(<$fh>) {
if (/^test: (.+)\n/) {
@@ -103,7 +103,7 @@ sub parse_results($$$$)
}
}
- while ($#$open_tests > $orig_open_len) {
+ while ($#$open_tests+1 > 0) {
$msg_ops->end_test(pop(@$open_tests), "error", 1,
"was started but never finished!");
$statistics->{TESTS_ERROR}++;
diff --git a/selftest/Subunit/Filter.pm b/selftest/Subunit/Filter.pm
index 799b5dd7fb..3a9e4f9409 100644
--- a/selftest/Subunit/Filter.pm
+++ b/selftest/Subunit/Filter.pm
@@ -40,17 +40,6 @@ sub find_in_list($$)
return undef;
}
-my $statistics = {
- SUITES_FAIL => 0,
-
- TESTS_UNEXPECTED_OK => 0,
- TESTS_EXPECTED_OK => 0,
- TESTS_UNEXPECTED_FAIL => 0,
- TESTS_EXPECTED_FAIL => 0,
- TESTS_ERROR => 0,
- TESTS_SKIP => 0,
-};
-
sub control_msg()
{
# We regenerate control messages, so ignore this
diff --git a/selftest/filter-subunit.pl b/selftest/filter-subunit.pl
index cbc078765e..912070a0d4 100755
--- a/selftest/filter-subunit.pl
+++ b/selftest/filter-subunit.pl
@@ -93,6 +93,6 @@ my $statistics = {
my $msg_ops = new Subunit::Filter($opt_prefix, \@expected_failures);
-parse_results($msg_ops, $statistics, *STDIN, []);
+parse_results($msg_ops, $statistics, *STDIN);
0;
diff --git a/selftest/format-subunit.pl b/selftest/format-subunit.pl
index acaac697aa..77e4b34f38 100755
--- a/selftest/format-subunit.pl
+++ b/selftest/format-subunit.pl
@@ -92,7 +92,7 @@ if ($opt_format eq "buildfarm") {
die("Invalid output format '$opt_format'");
}
-my $expected_ret = parse_results($msg_ops, $statistics, *STDIN, []);
+my $expected_ret = parse_results($msg_ops, $statistics, *STDIN);
$msg_ops->summary();