In perl.git, the branch blead has been updated

<http://perl5.git.perl.org/perl.git/commitdiff/f095462e34b22920726c6bdd6b1140fdb9a5ae39?hp=0efa6de71269185adc8155368e49d31c82e1e21c>

- Log -----------------------------------------------------------------
commit f095462e34b22920726c6bdd6b1140fdb9a5ae39
Author: Tony Cook <[email protected]>
Date:   Mon Oct 20 15:29:01 2014 +1100

    these permissions appear to be handled correctly in current cygwin
    
    this TODO has been passing on my smoke testers for years, if it turns
    out it isn't passing for someone, it should probably be skipped
    instead of TODOed to prevent the noise.

M       lib/File/Copy.t

commit c1976a97f7ea6ecccbf8daf996f3690e227243e4
Author: Tony Cook <[email protected]>
Date:   Mon Oct 20 15:13:21 2014 +1100

    use a different name for the test directory
    
    on Windows (cygwin) I was getting rare failures creating $copy1 with
    an error complaining that it was a directory, possibly due to some
    background process tracking directories.

M       lib/File/Copy.t

commit 860874cfffe19048bac963f61026dd7307337549
Author: Tony Cook <[email protected]>
Date:   Mon Oct 20 14:08:16 2014 +1100

    wrap the failing call_checker test in an eval and TODO it
    
    this allows the rest of the test script to run, and will help make other
    cygwin test issues more obvious once the other failures are fixed or
    worked-around

M       ext/XS-APItest/t/call_checker.t
-----------------------------------------------------------------------

Summary of changes:
 ext/XS-APItest/t/call_checker.t |  7 +++++--
 lib/File/Copy.t                 | 19 ++++++++-----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/ext/XS-APItest/t/call_checker.t b/ext/XS-APItest/t/call_checker.t
index 377cb74..a9ad1c7 100644
--- a/ext/XS-APItest/t/call_checker.t
+++ b/ext/XS-APItest/t/call_checker.t
@@ -4,8 +4,11 @@ use Test::More tests => 76;
 
 use XS::APItest;
 
-XS::APItest::test_cv_getset_call_checker();
-ok 1;
+{
+    local $TODO = $^O eq "cygwin" ? "[perl #78502] function pointers don't 
match on cygwin" : "";
+    ok( eval { XS::APItest::test_cv_getset_call_checker(); 1 })
+      or diag $@;
+}
 
 my @z = ();
 my @a = qw(a);
diff --git a/lib/File/Copy.t b/lib/File/Copy.t
index 16b951d..9e49c7d 100644
--- a/lib/File/Copy.t
+++ b/lib/File/Copy.t
@@ -292,6 +292,7 @@ SKIP: {
     my $copy4 = "copy4-$$";
     my $copy5 = "copy5-$$";
     my $copy6 = "copy6-$$";
+    my $copyd = "copyd-$$";
 
     open my $fh => ">", $src   or die $!;
     close   $fh                or die $!;
@@ -317,11 +318,11 @@ SKIP: {
            # Test that we can actually set a file to the correct permission.
            # Slightly convoluted, because some operating systems will let us
            # set a directory, but not a file. These should all work:
-           mkdir $copy1 or die "Can't mkdir $copy1: $!";
-           chmod $s_perm, $copy1
-               or die sprintf "Can't chmod %o $copy1: $!", $s_perm;
-           rmdir $copy1
-               or die sprintf "Can't rmdir $copy1: $!";
+           mkdir $copyd or die "Can't mkdir $copyd: $!";
+           chmod $s_perm, $copyd
+               or die sprintf "Can't chmod %o $copyd: $!", $s_perm;
+           rmdir $copyd
+               or die sprintf "Can't rmdir $copyd: $!";
            open my $fh0, '>', $copy1 or die "Can't open $copy1: $!";
            close $fh0 or die "Can't close $copy1: $!";
            unless (chmod $s_perm, $copy1) {
@@ -363,12 +364,8 @@ SKIP: {
             is (__$perm2, __$permdef, "Permission bits set correctly");
             is (__$perm4, __$c_perm1, "Permission bits set correctly");
             is (__$perm5, __$c_perm1, "Permission bits set correctly");
-            TODO: {
-                local $TODO = 'Permission bits inconsistent under cygwin'
-                   if $^O eq 'cygwin';
-                is (__$perm3, __$c_perm3, "Permission bits not modified");
-                is (__$perm6, __$c_perm3, "Permission bits not modified");
-            }
+            is (__$perm3, __$c_perm3, "Permission bits not modified");
+            is (__$perm6, __$c_perm3, "Permission bits not modified");
         }
     }
     umask $old_mask or die $!;

--
Perl5 Master Repository

Reply via email to