In perl.git, the branch blead has been updated

<http://perl5.git.perl.org/perl.git/commitdiff/d4ead2eb2e301c11d2d2e40b0c3fac9190fd5379?hp=e2b8b3e7fdfd63eca46d686d66dd4e7a69045de5>

- Log -----------------------------------------------------------------
commit d4ead2eb2e301c11d2d2e40b0c3fac9190fd5379
Author: Tony Cook <[email protected]>
Date:   Mon Dec 17 20:06:47 2012 +1100

    skip the \N{...} unloaded charnames croak test when PERL_UNICODE set
    
    This has been causing failures for a while.

M       t/lib/croak/toke

commit c004423157a75cf7cb0aa890d9fbe27de84dfb9a
Author: Tony Cook <[email protected]>
Date:   Mon Dec 17 20:05:56 2012 +1100

    SKIP in run_multiple_progs() was parsed but unimplemented, implement it

M       t/test.pl
-----------------------------------------------------------------------

Summary of changes:
 t/lib/croak/toke |    1 +
 t/test.pl        |   10 ++++++++++
 2 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/t/lib/croak/toke b/t/lib/croak/toke
index 329e12c..8e4b033 100644
--- a/t/lib/croak/toke
+++ b/t/lib/croak/toke
@@ -73,6 +73,7 @@ Constant(q) unknown at - line 3, within pattern
 Execution of - aborted due to compilation errors.
 ########
 # NAME \N{...} when charnames fails to load but without an error
+# SKIP ? exists $ENV{PERL_UNICODE} ? "Unreliable under some PERL_UNICODE 
settings" : 0
 BEGIN { ++$_ for @INC{"charnames.pm","_charnames.pm"} }
 "\N{a}"
 EXPECT
diff --git a/t/test.pl b/t/test.pl
index c4e6fd1..e141b91 100644
--- a/t/test.pl
+++ b/t/test.pl
@@ -985,6 +985,7 @@ sub run_multiple_progs {
 
     my $tmpfile = tempfile();
 
+  PROGRAM:
     for (@prgs){
        unless (/\n/) {
            print "# From $_\n";
@@ -1011,11 +1012,20 @@ sub run_multiple_progs {
                $reason{$what} = $temp;
            }
        }
+
        my $name = '';
        if ($prog =~ s/^#\s*NAME\s+(.+)\n//m) {
            $name = $1;
        }
 
+       if ($reason{skip}) {
+       SKIP:
+         {
+           skip($name ? "$name - $reason{skip}" : $reason{skip}, 1);
+         }
+         next PROGRAM;
+       }
+
        if ($prog =~ /--FILE--/) {
            my @files = split(/\n?--FILE--\s*([^\s\n]*)\s*\n/, $prog) ;
            shift @files ;

--
Perl5 Master Repository

Reply via email to