selftest: Use standard subunit command for progress reporting.

1 files changed, 4 insertions, 5 deletions

diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 462fa752bc..68a2b2d671 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -228,8 +228,8 @@ sub run_testsuite($$$$$)
 	my ($envname, $name, $cmd, $i, $totalsuites) = @_;
 	my $pcap_file = setup_pcap($name);
 
-	Subunit::progress_push();
 	Subunit::start_testsuite($name);
+	Subunit::progress_push();
 	Subunit::report_time(time());
 
 	open(RESULTS, "$cmd 2>&1|");
@@ -250,8 +250,8 @@ sub run_testsuite($$$$$)
 
 	unless (close(RESULTS)) {
 		if ($!) {
-			Subunit::end_testsuite($name, "error", "Unable to run $cmd: $!");
 			Subunit::progress_pop();
+			Subunit::end_testsuite($name, "error", "Unable to run $cmd: $!");
 			return 0;
 		} else {
 			$ret = $?;
@@ -259,8 +259,8 @@ sub run_testsuite($$$$$)
 	} 
 
 	if ($ret & 127) {
-		Subunit::end_testsuite($name, "error", sprintf("Testsuite died with signal %d, %s coredump", ($ret & 127), ($ret & 128) ? "with": "without"));
 		Subunit::progress_pop();
+		Subunit::end_testsuite($name, "error", sprintf("Testsuite died with signal %d, %s coredump", ($ret & 127), ($ret & 128) ? "with": "without"));
 		return 0;
 	}
 	my $envlog = getlog_env($envname);
@@ -274,12 +274,12 @@ sub run_testsuite($$$$$)
 	my $exitcode = $ret >> 8;
 
 	Subunit::report_time(time());
+	Subuit::progress_pop();
 	if ($exitcode == 0) {
 		Subunit::end_testsuite($name, "success");
 	} else {
 		Subunit::end_testsuite($name, "failure", "Exit code was $exitcode");
 	}
-	Subunit::progress_pop();
 
 	cleanup_pcap($pcap_file, $exitcode);
 
@@ -688,7 +688,6 @@ foreach my $fn (@testlists) {
 	}
 }
 
-Subunit::testsuite_count($#available+1);
 Subunit::progress($#available+1);
 Subunit::report_time(time());