[perl.git] branch blead, updated. v5.21.10-83-ge738508

[Dave Mitchell]

In perl.git, the branch blead has been updated

<http://perl5.git.perl.org/perl.git/commitdiff/e7385084ab3057dcf5d38c8f351f7092f44d3f22?hp=1e2bda49b56584d987d09abed7850a558584efa4>

- Log -----------------------------------------------------------------
commit e7385084ab3057dcf5d38c8f351f7092f44d3f22
Author: David Mitchell <da...@iabyn.com>
Date:   Fri Apr 17 11:39:12 2015 +0100

    fix t/uni/parser.t test
    
    The test I recently added expected a specific set of error strings to
    be output when running a small expected-fail program. One of those strings
    was 'Wide character in print', which doesn't appear if the test is
    run under PERL_UNICODE="".
    
    So replace the expected string with a regex.
-----------------------------------------------------------------------

Summary of changes:
 t/uni/parser.t | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/t/uni/parser.t b/t/uni/parser.t
index 3d89249..b2a9fcd 100644
--- a/t/uni/parser.t
+++ b/t/uni/parser.t
@@ -214,10 +214,13 @@ like( $@, qr/Bad name after Ｆｏｏ'/, 'Bad name after 
Ｆｏｏ\'' );
 {
     no utf8;
 
-    fresh_perl_is(qq{use utf8; "\$\xe3\x80\xb0"}, <<EOF, { stderr => 1},
-Wide character in print at - line 1.\
-syntax error at - line 1, near "\$\xe3\x80\xb0"
-Execution of - aborted due to compilation errors.
-EOF
-    "RT# 124216");
+    fresh_perl_like(qq{use utf8; "\$\xe3\x80\xb0"},
+        qr/
+            \A
+            ( \QWide character in print at - line 1.\E\n )?
+            \Qsyntax error at - line 1, near \E"\$.*"\n
+            \QExecution of - aborted due to compilation errors.\E\z
+        /xm,
+
+        {stderr => 1}, "RT# 124216");
 }

--
Perl5 Master Repository