[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-1313-g5f5fa36

Stefan Metzmacher metze at samba.org
Tue Mar 18 15:00:31 GMT 2008


The branch, v4-0-test has been updated
       via  5f5fa368c2ca472409c0082400b6e26029dfd7b5 (commit)
      from  842d144b4fb0981250157f72956e732709663107 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit 5f5fa368c2ca472409c0082400b6e26029dfd7b5
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Mar 18 15:36:03 2008 +0100

    selftest: fix parsing of Subunit results
    
    This reverts parts of
    903eb9a23d80576f5df2d90a0e025f2366ffe4c6
    and
    9196213c49532ac60349ff55e66430b7c80b09c2.
    
    metze

-----------------------------------------------------------------------

Summary of changes:
 source/selftest/Subunit.pm |   31 +------------------------------
 1 files changed, 1 insertions(+), 30 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/selftest/Subunit.pm b/source/selftest/Subunit.pm
index 1c27943..e5c61ca 100644
--- a/source/selftest/Subunit.pm
+++ b/source/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);


-- 
Samba Shared Repository


More information about the samba-cvs mailing list