summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2008-03-18 09:36:29 +0100
committerStefan Metzmacher <metze@samba.org>2008-03-18 13:16:44 +0100
commit297399d877476bd72fbf8055cd728b6f8230ba09 (patch)
treea04474f6238bd6f2f93bff1b01c737de4277cc4f
parenta1875b039bb77bad9c3cef4e1ebe037a7e645938 (diff)
downloadsamba-297399d877476bd72fbf8055cd728b6f8230ba09.tar.gz
samba-297399d877476bd72fbf8055cd728b6f8230ba09.tar.bz2
samba-297399d877476bd72fbf8055cd728b6f8230ba09.zip
selftest: use a separate var for printing out sub parts of lines with \r
This restores the bahavior of the $_ variable in the code that detects expected failures. metze (This used to be commit 903eb9a23d80576f5df2d90a0e025f2366ffe4c6)
-rw-r--r--source4/selftest/Subunit.pm6
1 files changed, 4 insertions, 2 deletions
diff --git a/source4/selftest/Subunit.pm b/source4/selftest/Subunit.pm
index f8a7794aac..1c279437c8 100644
--- a/source4/selftest/Subunit.pm
+++ b/source4/selftest/Subunit.pm
@@ -17,6 +17,7 @@ sub parse_results($$$$$)
while(1) {
my $line = "";
+ my $subline = "";
my $char = "";
my $eof = 0;
my $error = 0;
@@ -33,9 +34,10 @@ sub parse_results($$$$$)
}
$line .= $char;
+ $subline .= $char;
if ($char eq "\r") {
- $msg_ops->output_msg($line);
- $line = "";
+ $msg_ops->output_msg($subline);
+ $subline = "";
}
}