Return-Path: Delivered-To: apmail-perl-modperl-cvs-archive@www.apache.org Received: (qmail 54425 invoked from network); 31 May 2006 04:05:25 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 31 May 2006 04:05:25 -0000 Received: (qmail 52167 invoked by uid 500); 31 May 2006 04:05:25 -0000 Delivered-To: apmail-perl-modperl-cvs-archive@perl.apache.org Received: (qmail 52147 invoked by uid 500); 31 May 2006 04:05:25 -0000 Mailing-List: contact modperl-cvs-help@perl.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@perl.apache.org List-Id: Delivered-To: mailing list modperl-cvs@perl.apache.org Received: (qmail 52113 invoked by uid 99); 31 May 2006 04:05:24 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 May 2006 21:05:24 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 May 2006 21:05:24 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 3D3C21A983A; Tue, 30 May 2006 21:05:03 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r410427 - /perl/modperl/trunk/t/lib/TestAPRlib/finfo.pm Date: Wed, 31 May 2006 04:05:02 -0000 To: modperl-cvs@perl.apache.org From: randyk@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060531040503.3D3C21A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: randyk Date: Tue May 30 21:05:02 2006 New Revision: 410427 URL: http://svn.apache.org/viewvc?rev=410427&view=rev Log: On Win32, there's a bug in the apr library supplied with Apache/2.2 that causes the FPROT_WREAD and FPROT_WWRITE tests to fail. This is slated to be fixed after apr-1.2.7. Modified: perl/modperl/trunk/t/lib/TestAPRlib/finfo.pm Modified: perl/modperl/trunk/t/lib/TestAPRlib/finfo.pm URL: http://svn.apache.org/viewvc/perl/modperl/trunk/t/lib/TestAPRlib/finfo.pm?rev=410427&r1=410426&r2=410427&view=diff ============================================================================== --- perl/modperl/trunk/t/lib/TestAPRlib/finfo.pm (original) +++ perl/modperl/trunk/t/lib/TestAPRlib/finfo.pm Tue May 30 21:05:02 2006 @@ -18,6 +18,7 @@ use constant OSX => Apache::TestConfig::OSX; use constant APACHE_2_0_49_PLUS => have_min_apache_version('2.0.49'); +use constant APACHE_2_2_PLUS => have_min_apache_version('2.2.0'); use APR::Const -compile => qw(SUCCESS FINFO_NORM FILETYPE_REG FPROT_WREAD FPROT_WWRITE @@ -145,14 +146,25 @@ # match world bits - ok t_cmp($finfo->protection & APR::Const::FPROT_WREAD, - $stat->{protection} & S_IROTH, - '$finfo->protection() & APR::Const::FPROT_WREAD'); - - ok t_cmp($finfo->protection & APR::Const::FPROT_WWRITE, - $stat->{protection} & S_IWOTH, - '$finfo->protection() & APR::Const::FPROT_WWRITE'); - + # on Win32, there's a bug in the apr library supplied + # with Apache/2.2 that causes the following two tests + # to fail. This is slated to be fixed after apr-1.2.7. + if (WIN32 and APACHE_2_2_PLUS) { + skip "broken apr stat on Win32", 0; + } + else { + ok t_cmp($finfo->protection & APR::Const::FPROT_WREAD, + $stat->{protection} & S_IROTH, + '$finfo->protection() & APR::Const::FPROT_WREAD'); + } + if (WIN32 and APACHE_2_2_PLUS) { + skip "broken apr stat on Win32", 0; + } + else { + ok t_cmp($finfo->protection & APR::Const::FPROT_WWRITE, + $stat->{protection} & S_IWOTH, + '$finfo->protection() & APR::Const::FPROT_WWRITE'); + } if (WIN32) { skip "different file semantics", 0; }