Commit 9196213c authored by Stefan Metzmacher's avatar Stefan Metzmacher Committed by Stefan Metzmacher

selftest: handle progress output in verbose mode

metze
parent 61a87bed
......@@ -15,7 +15,34 @@ sub parse_results($$$$$)
my $unexpected_err = 0;
my $orig_open_len = $#$open_tests;
while(<$fh>) {
while(1) {
my $line = "";
my $char = "";
my $eof = 0;
my $error = 0;
while ($char ne "\n") {
my $ret = sysread($fh, $char, 1);
if (not defined($ret)) {
$error = $!;
last;
}
if ($ret == 0) {
$eof = 1;
last;
}
$line .= $char;
if ($char eq "\r") {
$msg_ops->output_msg($line);
$line = "";
}
}
last if ($eof or $error);
$_ = $line;
if (/^test: (.+)\n/) {
$msg_ops->control_msg($_);
$msg_ops->start_test($open_tests, $1);
......
......@@ -7,8 +7,6 @@ use Exporter;
use FindBin qw($RealBin);
use lib "$RealBin/..";
use Subunit qw(parse_results);
use strict;
sub new($$$$$$$) {
......@@ -62,7 +60,9 @@ sub output_msg($$)
my ($self, $output) = @_;
if ($self->{verbose}) {
require FileHandle;
print $output;
STDOUT->flush();
} else {
$self->{test_output}->{$self->{NAME}} .= $output;
}
......
......@@ -584,7 +584,7 @@ push (@torture_options, "--configfile=$conffile");
push (@torture_options, "--maximum-runtime=$torture_maxtime");
push (@torture_options, "--target=$opt_target");
push (@torture_options, "--basedir=$prefix_abs");
push (@torture_options, "--option=torture:progress=no") if ($opt_format eq "buildfarm");
push (@torture_options, "--option=torture:progress=no") unless ($opt_verbose);
push (@torture_options, "--format=subunit");
push (@torture_options, "--option=torture:quick=yes") if ($opt_quick);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment