diff options
| author | Jeremy Allison <jra@samba.org> | 2010-03-31 10:01:03 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2010-03-31 10:01:03 -0700 |
| commit | 2e839a636b2ea3f4d8dfcf5a8e99d9725787ba61 (patch) | |
| tree | 42f219978f7d07d8fa196cb9ebd9db7be971450d /selftest/selftest.pl | |
| parent | f58d02dbeeeba037ee79fba93a707e959e90ffa3 (diff) | |
| parent | 6f30b9a6ff57ca6112e6319c64c411d2bf09be79 (diff) | |
| download | samba-2e839a636b2ea3f4d8dfcf5a8e99d9725787ba61.tar.gz samba-2e839a636b2ea3f4d8dfcf5a8e99d9725787ba61.tar.bz2 samba-2e839a636b2ea3f4d8dfcf5a8e99d9725787ba61.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'selftest/selftest.pl')
| -rwxr-xr-x | selftest/selftest.pl | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/selftest/selftest.pl b/selftest/selftest.pl index 7bbad62bbf..634db92c92 100755 --- a/selftest/selftest.pl +++ b/selftest/selftest.pl @@ -229,6 +229,7 @@ sub run_testsuite($$$$$) my $pcap_file = setup_pcap($name); Subunit::start_testsuite($name); + Subunit::progress_push(); Subunit::report_time(time()); open(RESULTS, "$cmd 2>&1|"); @@ -249,6 +250,7 @@ sub run_testsuite($$$$$) unless (close(RESULTS)) { if ($!) { + Subunit::progress_pop(); Subunit::end_testsuite($name, "error", "Unable to run $cmd: $!"); return 0; } else { @@ -257,6 +259,7 @@ sub run_testsuite($$$$$) } if ($ret & 127) { + Subunit::progress_pop(); Subunit::end_testsuite($name, "error", sprintf("Testsuite died with signal %d, %s coredump", ($ret & 127), ($ret & 128) ? "with": "without")); return 0; } @@ -271,6 +274,7 @@ sub run_testsuite($$$$$) my $exitcode = $ret >> 8; Subunit::report_time(time()); + Subunit::progress_pop(); if ($exitcode == 0) { Subunit::end_testsuite($name, "success"); } else { @@ -684,7 +688,7 @@ foreach my $fn (@testlists) { } } -Subunit::testsuite_count($#available+1); +Subunit::progress($#available+1); Subunit::report_time(time()); foreach (@available) { |