From: Michael G. Schwern <schwern@pobox.com>
Date: Sun, 12 Jul 2009 09:30:26 +0000 (-0700)
Subject: Make fresh_perl_is() strip newlines off the expected result just like it does the... 
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=50f17f89e39de789061e7b524edee5cd2cf79a37;p=p5sagit%2Fp5-mst-13.2.git

Make fresh_perl_is() strip newlines off the expected result just like it does the result so tests don't weirdly fail just because the author didn't realize it was normalizing newlines.
---

diff --git a/t/test.pl b/t/test.pl
index 32c4a37..4b2161f 100644
--- a/t/test.pl
+++ b/t/test.pl
@@ -681,7 +681,7 @@ sub _fresh_perl {
     my $status = $?;
 
     # Clean up the results into something a bit more predictable.
-    $results =~ s/\n+$//;
+    $results  =~ s/\n+$//;
     $results =~ s/at\s+$::tempfile_regexp\s+line/at - line/g;
     $results =~ s/of\s+$::tempfile_regexp\s+aborted/of - aborted/g;
 
@@ -722,6 +722,11 @@ sub _fresh_perl {
 
 sub fresh_perl_is {
     my($prog, $expected, $runperl_args, $name) = @_;
+
+    # _fresh_perl() is going to clip the trailing newlines off the result.
+    # This will make it so the test author doesn't have to know that.
+    $expected =~ s/\n+$//;
+
     local $Level = 2;
     _fresh_perl($prog,
 		sub { @_ ? $_[0] eq $expected : $expected },