diff options
author | Stefan Metzmacher <metze@samba.org> | 2008-03-18 15:36:03 +0100 |
---|---|---|
committer | Stefan Metzmacher <metze@samba.org> | 2008-03-18 15:59:21 +0100 |
commit | 5b35e551300419d75b2405ba76bff8e7ec5a01af (patch) | |
tree | b898481b33135b20d03ac23fc3cf4a34c4c24f53 | |
parent | 3b63333cf272fae301e22e9a021f0bbf60d1c413 (diff) | |
download | samba-5b35e551300419d75b2405ba76bff8e7ec5a01af.tar.gz samba-5b35e551300419d75b2405ba76bff8e7ec5a01af.tar.bz2 samba-5b35e551300419d75b2405ba76bff8e7ec5a01af.zip |
selftest: fix parsing of Subunit results
This reverts parts of
903eb9a23d80576f5df2d90a0e025f2366ffe4c6
and
9196213c49532ac60349ff55e66430b7c80b09c2.
metze
(This used to be commit 5f5fa368c2ca472409c0082400b6e26029dfd7b5)
-rw-r--r-- | source4/selftest/Subunit.pm | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/source4/selftest/Subunit.pm b/source4/selftest/Subunit.pm index 1c279437c8..e5c61ca9ba 100644 --- a/source4/selftest/Subunit.pm +++ b/source4/selftest/Subunit.pm @@ -15,36 +15,7 @@ sub parse_results($$$$$) my $unexpected_err = 0; my $orig_open_len = $#$open_tests; - while(1) { - my $line = ""; - my $subline = ""; - 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; - $subline .= $char; - if ($char eq "\r") { - $msg_ops->output_msg($subline); - $subline = ""; - } - } - - last if ($eof or $error); - - $_ = $line; - + while(<$fh>) { if (/^test: (.+)\n/) { $msg_ops->control_msg($_); $msg_ops->start_test($open_tests, $1); |