In perl.git, the branch blead has been updated

<http://perl5.git.perl.org/perl.git/commitdiff/dfe3adb55fc27cfdbdea35190eb5023e786b1466?hp=27fe105ac377b5c29a778e3ff9a9f13711204da2>

- Log -----------------------------------------------------------------
commit dfe3adb55fc27cfdbdea35190eb5023e786b1466
Author: Tony Cook <[email protected]>
Date:   Mon Apr 4 10:26:15 2016 +1000

    note for detecting crypt() on Cygwin

M       README.cygwin

commit 48d9c42720bd6af3c245182872e858b5810fd003
Author: Tony Cook <[email protected]>
Date:   Mon Apr 4 09:52:57 2016 +1000

    don't test crypt()s tied fetch count if we don't have crypt()
    
    As of libcrypt 1.3, crypt() isn't detected on cygwin unless you install
    libcrypt-devel, and this test failed.

M       t/op/tie_fetch_count.t
-----------------------------------------------------------------------

Summary of changes:
 README.cygwin          |  3 +++
 t/op/tie_fetch_count.t | 18 ++++++++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/README.cygwin b/README.cygwin
index d54c030..90fb14b 100644
--- a/README.cygwin
+++ b/README.cygwin
@@ -108,6 +108,9 @@ DES crypt port by Corinna Vinschen.
 
 Alternatively, the crypt libraries in GNU libc have been ported to Cygwin.
 
+As of libcrypt 1.3 (March 2016), you will need to install the
+libcrypt-devel package for Configure to detect crypt().
+
 =item * C<-lgdbm_compat> (C<use GDBM_File>)
 
 GDBM is available for Cygwin.
diff --git a/t/op/tie_fetch_count.t b/t/op/tie_fetch_count.t
index 82a8543..2b3b01a 100644
--- a/t/op/tie_fetch_count.t
+++ b/t/op/tie_fetch_count.t
@@ -242,12 +242,18 @@ for 
([chdir=>''],[chmod=>'0,'],[chown=>'0,0,'],[utime=>'0,0,'],
     check_count "$op $args\\\$tied_glob$postargs";
 }
 
-$dummy  =   crypt $var,0; check_count 'crypt $tied, ...';
-$dummy  =   crypt 0,$var; check_count 'crypt ..., $tied';
-$var = substr(chr 256,0,0);
-$dummy  =   crypt $var,0; check_count 'crypt $tied_utf8, ...';
-$var = substr(chr 256,0,0);
-$dummy  =   crypt 0,$var; check_count 'crypt ..., $tied_utf8';
+my $can_config = eval { require Config; 1 };
+SKIP:
+{
+    skip "No Config", 4 unless $can_config;
+    skip "No crypt()", 4 unless $Config::Config{d_crypt};
+    $dummy  =   crypt $var,0; check_count 'crypt $tied, ...';
+    $dummy  =   crypt 0,$var; check_count 'crypt ..., $tied';
+    $var = substr(chr 256,0,0);
+    $dummy  =   crypt $var,0; check_count 'crypt $tied_utf8, ...';
+    $var = substr(chr 256,0,0);
+    $dummy  =   crypt 0,$var; check_count 'crypt ..., $tied_utf8';
+}
 
 SKIP:
 {

--
Perl5 Master Repository

Reply via email to