You are viewing a plain text version of this content. The canonical link for it is here.
Posted to modperl-cvs@perl.apache.org by ge...@apache.org on 2004/04/15 15:00:24 UTC

cvs commit: modperl-2.0/t/response/TestAPR finfo.pm

geoff       2004/04/15 06:00:24

  Modified:    perl-framework/Apache-Test/lib/Apache TestConfig.pm
               t/response/TestAPR finfo.pm
  Log:
  skip group finfo test on darwin (for the moment)
  
  Revision  Changes    Path
  1.221     +1 -0      httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
  
  Index: TestConfig.pm
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm,v
  retrieving revision 1.220
  retrieving revision 1.221
  diff -u -r1.220 -r1.221
  --- TestConfig.pm	9 Apr 2004 22:22:47 -0000	1.220
  +++ TestConfig.pm	15 Apr 2004 13:00:24 -0000	1.221
  @@ -18,6 +18,7 @@
   use warnings FATAL => 'all';
   
   use constant WIN32   => $^O eq 'MSWin32';
  +use constant OSX     => $^O eq 'darwin';
   use constant CYGWIN  => $^O eq 'cygwin';
   use constant NETWARE => $^O eq 'NetWare';
   use constant SOLARIS => $^O eq 'solaris';
  
  
  
  1.9       +13 -4     modperl-2.0/t/response/TestAPR/finfo.pm
  
  Index: finfo.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/response/TestAPR/finfo.pm,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- finfo.pm	14 Jan 2004 21:27:41 -0000	1.8
  +++ finfo.pm	15 Apr 2004 13:00:24 -0000	1.9
  @@ -8,6 +8,7 @@
   use Apache::TestTrace;
   use Apache::TestConfig;
   use constant WIN32 => Apache::TestConfig::WIN32;
  +use constant OSX   => Apache::TestConfig::OSX;
   
   use Apache::RequestRec ();
   use APR::Finfo ();
  @@ -55,10 +56,18 @@
           our ($device, $inode, $protection, $nlink, $user, $group,
                undef, $size, $atime, $mtime, $ctime) = stat $file;
   
  -        # skip certain tests on Win32 (and others?)
  -        # atime is wrong on NTFS, but OK on FAT32
  -        my %skip =  WIN32 ?
  -            (map {$_ => 1} qw(device inode user group atime) ) : ();
  +        # skip certain tests on Win32 and others
  +        my %skip = ();
  +
  +        if (WIN32) {
  +            # atime is wrong on NTFS, but OK on FAT32
  +            %skip = map {$_ => 1} qw(device inode user group atime);
  +        }
  +        elsif (OSX) {
  +            # XXX both apr and perl report incorrect group values.  sometimes.
  +            # XXX skip until we can really figure out what is going on.
  +            %skip = (group => 1);
  +        }
   
           # compare stat fields between perl and apr_stat
           {