diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-03-19 10:18:35 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-03-19 10:18:35 +1100 |
| commit | b1b37e3776c6e6e20f42140a907e296b65cc0c62 (patch) | |
| tree | 601f049791bcbd9df9daef64b0b1003dbf1a413b /source4/selftest/Subunit.pm | |
| parent | 9e6b0c28712ee77ce878809c8576826a3ba08d95 (diff) | |
| parent | 52669d84722c175555e17a222077f845d9aa958f (diff) | |
| download | samba-b1b37e3776c6e6e20f42140a907e296b65cc0c62.tar.gz samba-b1b37e3776c6e6e20f42140a907e296b65cc0c62.tar.bz2 samba-b1b37e3776c6e6e20f42140a907e296b65cc0c62.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit 400c16e7004bc3a881bb6efb99a273cdac87f70c)
Diffstat (limited to 'source4/selftest/Subunit.pm')
| -rw-r--r-- | source4/selftest/Subunit.pm | 29 |
1 files changed, 1 insertions, 28 deletions
diff --git a/source4/selftest/Subunit.pm b/source4/selftest/Subunit.pm index f8a7794aac..e5c61ca9ba 100644 --- a/source4/selftest/Subunit.pm +++ b/source4/selftest/Subunit.pm @@ -15,34 +15,7 @@ sub parse_results($$$$$) my $unexpected_err = 0; my $orig_open_len = $#$open_tests; - 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; - + while(<$fh>) { if (/^test: (.+)\n/) { $msg_ops->control_msg($_); $msg_ops->start_test($open_tests, $1); |