r4968 - in /packages/libapache-session-perl/trunk: ./ Session/Lock/ debian/ t/

gwolf at users.alioth.debian.org gwolf at users.alioth.debian.org
Wed Mar 21 19:07:59 CET 2007


Author: gwolf
Date: Wed Mar 21 18:07:59 2007
New Revision: 4968

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=4968
Log:
New upstream version

Modified:
    packages/libapache-session-perl/trunk/CHANGES
    packages/libapache-session-perl/trunk/META.yml
    packages/libapache-session-perl/trunk/Makefile.PL
    packages/libapache-session-perl/trunk/Session.pm
    packages/libapache-session-perl/trunk/Session/Lock/File.pm
    packages/libapache-session-perl/trunk/Session/Lock/Semaphore.pm
    packages/libapache-session-perl/trunk/debian/changelog
    packages/libapache-session-perl/trunk/t/99dbfile.t
    packages/libapache-session-perl/trunk/t/99dbfilestore.t
    packages/libapache-session-perl/trunk/t/99file.t
    packages/libapache-session-perl/trunk/t/99filelock.t
    packages/libapache-session-perl/trunk/t/99filestore.t
    packages/libapache-session-perl/trunk/t/99flex.t
    packages/libapache-session-perl/trunk/t/99md5gen.t
    packages/libapache-session-perl/trunk/t/99moduniqgen.t
    packages/libapache-session-perl/trunk/t/99mysql.t
    packages/libapache-session-perl/trunk/t/99mysqllock.t
    packages/libapache-session-perl/trunk/t/99mysqlstore.t
    packages/libapache-session-perl/trunk/t/99nulllock.t
    packages/libapache-session-perl/trunk/t/99oracle.t
    packages/libapache-session-perl/trunk/t/99postgres.t
    packages/libapache-session-perl/trunk/t/99semaphore.t
    packages/libapache-session-perl/trunk/t/99storable.t
    packages/libapache-session-perl/trunk/t/99uue.t

Modified: packages/libapache-session-perl/trunk/CHANGES
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libapache-session-perl/trunk/CHANGES?rev=4968&op=diff
==============================================================================
--- packages/libapache-session-perl/trunk/CHANGES (original)
+++ packages/libapache-session-perl/trunk/CHANGES Wed Mar 21 18:07:59 2007
@@ -1,3 +1,18 @@
+1.82   2007-02-21 by Alexandr Ciornii (alexchorny AT gmail.com)
+  - Slightly faster test skip
+  - 99semaphore.t and 99flex.t check for cygserver on Cygwin
+  - 99flex.t skips less tests in some cases
+  - 99flex.t checks for Digest::MD5, MIME::Base64
+  - Warning in Apache::Session::Lock::Semaphore about cygserver
+  - Makefile.PL requires File::Temp
+  - changed order of use/chdir in tests (RT#16539, from Andrew Benham)
+
+1.81_01    2007-02-12 by Alexandr Ciornii
+  - My patch for Win32 and Cygwin (RT#18795)
+  - More information in Makefile.PL
+  - 99flex.t checks for Storable (RT#101)
+  - 99semaphore.t does not die if IPC:: modules are not present
+
 1.81   2006-05-23
 
   - Don't unconditionally try to require packages in Apache::Session::Flex
@@ -15,7 +30,7 @@
 
 ---
 
-Changes in 1.6:
+Changes in 1.6 (2004-02-24):
 
 Fixed file age test for clean().  The previous test was never true.
 
@@ -28,7 +43,7 @@
 Informix support from Mike Langen <mike.langen at tamedia.ch>.  Unfortunately no
 tests were included.
 
-Changes in 1.54:
+Changes in 1.54 (2001-10-11):
 
 Added mod_uniqueid and mod_usertrack generators from 
 Tatsuhiko Miyagawa <miyagawa at bulknews.net>
@@ -37,7 +52,7 @@
 
 Move to Digest::MD5 instead of MD5.
 
-Changes in 1.53:
+Changes in 1.53 (2000-09-01):
 
 ?
 

Modified: packages/libapache-session-perl/trunk/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libapache-session-perl/trunk/META.yml?rev=4968&op=diff
==============================================================================
--- packages/libapache-session-perl/trunk/META.yml (original)
+++ packages/libapache-session-perl/trunk/META.yml Wed Mar 21 18:07:59 2007
@@ -1,13 +1,17 @@
-# http://module-build.sourceforge.net/META-spec.html
-#XXXXXXX This is a prototype!!!  It will change in the future!!! XXXXX#
-name:         Apache-Session
-version:      1.81
-version_from: Session.pm
-installdirs:  site
-requires:
-    Test::Deep:                    0.082
-    Test::Exception:               0.15
-    Test::More:                    0.47
-
-distribution_type: module
-generated_by: ExtUtils::MakeMaker version 6.17
+--- #YAML:1.0
+name:                Apache-Session
+version:             1.82
+abstract:            A persistence framework for session data
+license:             perl
+generated_by:        ExtUtils::MakeMaker version 6.31
+distribution_type:   module
+requires:     
+    File::Temp:                    0
+    Test::Deep:                    0.082
+    Test::Exception:               0.15
+    Test::More:                    0.47
+meta-spec:
+    url:     http://module-build.sourceforge.net/META-spec-v1.2.html
+    version: 1.2
+author:
+    - Casey West <casey[at]geeknest.com>

Modified: packages/libapache-session-perl/trunk/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libapache-session-perl/trunk/Makefile.PL?rev=4968&op=diff
==============================================================================
--- packages/libapache-session-perl/trunk/Makefile.PL (original)
+++ packages/libapache-session-perl/trunk/Makefile.PL Wed Mar 21 18:07:59 2007
@@ -3,9 +3,14 @@
 WriteMakefile(
     NAME         => "Apache::Session",
     VERSION_FROM => "Session.pm",
+    ($ExtUtils::MakeMaker::VERSION ge '6.30_00'? 
+     ('LICENSE'		=> 'perl', ) : ()),
     PREREQ_PM    => {
                      'Test::More'      => '0.47',
                      'Test::Deep'      => '0.082',
                      'Test::Exception' => '0.15',
+                     'File::Temp'      => 0, #core from 5.6.1
                     },
+    AUTHOR          => 'Casey West <casey[at]geeknest.com>',
+    ABSTRACT        => 'A persistence framework for session data',
 );

Modified: packages/libapache-session-perl/trunk/Session.pm
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libapache-session-perl/trunk/Session.pm?rev=4968&op=diff
==============================================================================
--- packages/libapache-session-perl/trunk/Session.pm (original)
+++ packages/libapache-session-perl/trunk/Session.pm Wed Mar 21 18:07:59 2007
@@ -312,7 +312,7 @@
 use strict;
 use vars qw($VERSION);
 
-$VERSION = '1.81';
+$VERSION = '1.82';
 
 #State constants
 #

Modified: packages/libapache-session-perl/trunk/Session/Lock/File.pm
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libapache-session-perl/trunk/Session/Lock/File.pm?rev=4968&op=diff
==============================================================================
--- packages/libapache-session-perl/trunk/Session/Lock/File.pm (original)
+++ packages/libapache-session-perl/trunk/Session/Lock/File.pm Wed Mar 21 18:07:59 2007
@@ -15,7 +15,7 @@
 use Symbol;
 use vars qw($VERSION);
 
-$VERSION = '1.02';
+$VERSION = '1.03';
 
 $Apache::Session::Lock::File::LockDirectory = '/tmp';
 
@@ -26,10 +26,19 @@
 }
 
 sub acquire_read_lock  {
+    if ($^O eq 'MSWin32' or $^O eq 'cygwin') {
+        #Windows cannot escalate lock, so all locks will be exclusive
+        return &acquire_write_lock;
+    }
+    #Works for acquire_read_lock => acquire_write_lock => release_all_locks
+    #This hack does not support release_read_lock
+    #Changed by Alexandr Ciornii, 2006-06-21
+
     my $self    = shift;
     my $session = shift;
     
     return if $self->{read};
+    #does not support release_read_lock
 
     if (!$self->{opened}) {
         my $fh = Symbol::gensym();
@@ -70,6 +79,9 @@
 }
 
 sub release_read_lock  {
+    if ($^O eq 'MSWin32' or $^O eq 'cygwin') {
+        die "release_read_lock is not supported on Win32 or Cygwin";
+    }
     my $self    = shift;
     my $session = shift;
     
@@ -134,11 +146,16 @@
     foreach my $file (@files) {
         if ($file =~ /^Apache-Session.*\.lock$/) {
             if ($now - (stat($dir.'/'.$file))[8] >= $time) {
+              if ($^O eq 'MSWin32') {
+                #Windows cannot unlink opened file
+                unlink($dir.'/'.$file) || next;
+              } else {
                 open(FH, "+>$dir/".$file) || next;
                 flock(FH, LOCK_EX) || next;
                 unlink($dir.'/'.$file) || next;
                 flock(FH, LOCK_UN);
                 close(FH);
+              }
             }
         }
     }       
@@ -186,7 +203,7 @@
 =head1 NOTES
 
 This module does not unlink temporary files, because it interferes with proper
-locking.  THis can cause problems on certain systems (Linux) whose file systems
+locking.  This can cause problems on certain systems (Linux) whose file systems
 (ext2) do not perform well with lots of files in one directory.  To prevent this
 you should use a script to clean out old files from your lock directory.
 The meaning of old is left as a policy decision for the implementor, but a
@@ -197,6 +214,14 @@
  my $l = new Apache::Session::Lock::File;
  $l->clean('/var/lock/sessions', 3600) #remove files older than 1 hour
 
+=head2 Win32 and Cygwin
+
+Windows cannot escalate lock, so all locks will be exclusive.
+
+release_read_lock not supported - it is not used by Apache::Session.
+
+When deleting files, they are not locked (Win32 only).
+
 =head1 AUTHOR
 
 This module was written by Jeffrey William Baker <jwbaker at acm.org>.

Modified: packages/libapache-session-perl/trunk/Session/Lock/Semaphore.pm
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libapache-session-perl/trunk/Session/Lock/Semaphore.pm?rev=4968&op=diff
==============================================================================
--- packages/libapache-session-perl/trunk/Session/Lock/Semaphore.pm (original)
+++ packages/libapache-session-perl/trunk/Session/Lock/Semaphore.pm Wed Mar 21 18:07:59 2007
@@ -224,6 +224,13 @@
 one time and 16 sempahores the next, it won't work.  Use the system
 commands ipcs and ipcrm to inspect and remove unwanted semphore blocks.
 
+=head2 Cygwin
+
+IPC on Cygwin requires running cygserver. Without it, program will exit with
+"Bad System call" message. It cannot be intercepted with eval.
+
+Read /usr/share/doc/Cygwin/cygserver.README for more information.
+
 =head1 AUTHOR
 
 This module was written by Jeffrey William Baker <jwbaker at acm.org>.

Modified: packages/libapache-session-perl/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libapache-session-perl/trunk/debian/changelog?rev=4968&op=diff
==============================================================================
--- packages/libapache-session-perl/trunk/debian/changelog (original)
+++ packages/libapache-session-perl/trunk/debian/changelog Wed Mar 21 18:07:59 2007
@@ -1,3 +1,9 @@
+libapache-session-perl (1.82-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Gunnar Wolf <gwolf at debian.org>  Wed, 21 Mar 2007 11:53:52 -0600
+
 libapache-session-perl (1.81-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/libapache-session-perl/trunk/t/99dbfile.t
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libapache-session-perl/trunk/t/99dbfile.t?rev=4968&op=diff
==============================================================================
--- packages/libapache-session-perl/trunk/t/99dbfile.t (original)
+++ packages/libapache-session-perl/trunk/t/99dbfile.t Wed Mar 21 18:07:59 2007
@@ -53,4 +53,4 @@
 
 tied(%session)->delete;
 
-chdir( $origdir );
+chdir( $origdir );

Modified: packages/libapache-session-perl/trunk/t/99dbfilestore.t
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libapache-session-perl/trunk/t/99dbfilestore.t?rev=4968&op=diff
==============================================================================
--- packages/libapache-session-perl/trunk/t/99dbfilestore.t (original)
+++ packages/libapache-session-perl/trunk/t/99dbfilestore.t Wed Mar 21 18:07:59 2007
@@ -10,6 +10,12 @@
               };
 
 my $package = 'Apache::Session::Store::DB_File';
+
+plan tests => 13;
+
+use_ok $package;
+use_ok 'DB_File';
+can_ok $package, qw[new insert materialize remove];
 
 my $origdir = getcwd;
 my $tempdir = tempdir( DIR => '.', CLEANUP => 1 );
@@ -27,12 +33,6 @@
                    FileName => $dbfile,
                   },
 };
-
-plan tests => 13;
-
-use_ok $package;
-use_ok 'DB_File';
-can_ok $package, qw[new insert materialize remove];
 
 my $store = $package->new;
 isa_ok $store, $package;

Modified: packages/libapache-session-perl/trunk/t/99file.t
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libapache-session-perl/trunk/t/99file.t?rev=4968&op=diff
==============================================================================
--- packages/libapache-session-perl/trunk/t/99file.t (original)
+++ packages/libapache-session-perl/trunk/t/99file.t Wed Mar 21 18:07:59 2007
@@ -9,14 +9,14 @@
                require Fcntl;
               };
 
-my $origdir = getcwd;
-my $tempdir = tempdir( DIR => '.', CLEANUP => 1 );
-chdir( $tempdir );
-
 plan tests => 9;
 
 my $package = 'Apache::Session::File';
 use_ok $package;
+
+my $origdir = getcwd;
+my $tempdir = tempdir( DIR => '.', CLEANUP => 1 );
+chdir( $tempdir );
 
 my %session;
 my %tie_params = (

Modified: packages/libapache-session-perl/trunk/t/99filelock.t
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libapache-session-perl/trunk/t/99filelock.t?rev=4968&op=diff
==============================================================================
--- packages/libapache-session-perl/trunk/t/99filelock.t (original)
+++ packages/libapache-session-perl/trunk/t/99filelock.t Wed Mar 21 18:07:59 2007
@@ -15,14 +15,14 @@
                require Fcntl;
               };
 
-my $origdir = getcwd;
-my $tempdir = tempdir( DIR => '.', CLEANUP => 1 );
-chdir( $tempdir );
-
 plan tests => 4;
 
 my $package = 'Apache::Session::Lock::File';
 use_ok $package;
+
+my $origdir = getcwd;
+my $tempdir = tempdir( DIR => '.', CLEANUP => 1 );
+chdir( $tempdir );
 
 my $lock    = $package->new;
 my $session = {

Modified: packages/libapache-session-perl/trunk/t/99filestore.t
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libapache-session-perl/trunk/t/99filestore.t?rev=4968&op=diff
==============================================================================
--- packages/libapache-session-perl/trunk/t/99filestore.t (original)
+++ packages/libapache-session-perl/trunk/t/99filestore.t Wed Mar 21 18:07:59 2007
@@ -9,14 +9,14 @@
                require Fcntl;
               };
 
-my $origdir = getcwd;
-my $tempdir = tempdir( DIR => '.', CLEANUP => 1 );
-chdir( $tempdir );
-
 plan tests => 7;
 
 my $package = 'Apache::Session::Store::File';
 use_ok $package;
+
+my $origdir = getcwd;
+my $tempdir = tempdir( DIR => '.', CLEANUP => 1 );
+chdir( $tempdir );
 
 my $session = {
     serialized => 12345,

Modified: packages/libapache-session-perl/trunk/t/99flex.t
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libapache-session-perl/trunk/t/99flex.t?rev=4968&op=diff
==============================================================================
--- packages/libapache-session-perl/trunk/t/99flex.t (original)
+++ packages/libapache-session-perl/trunk/t/99flex.t Wed Mar 21 18:07:59 2007
@@ -4,22 +4,23 @@
 use File::Temp qw[tempdir];
 use Cwd qw[getcwd];
 
-plan skip_all => "Optional modules (Fcntl, DB_File, IPC::Semaphore, IPC::SysV) not installed: $@"
+#use Module::Mask;my $mask = new Module::Mask ('Storable');
+plan skip_all => "Optional modules (Fcntl, DB_File, Digest::MD5, Storable) not installed"
   unless eval {
                require Fcntl;
                require DB_File;
-               require IPC::Semaphore;
-               require IPC::SysV;
+               require Digest::MD5;
+               require Storable;
               };
-
-my $origdir = getcwd;
-my $tempdir = tempdir( DIR => '.', CLEANUP => 1 );
-chdir( $tempdir );
 
 plan tests => 12;
 
 my $package = 'Apache::Session::Flex';
 use_ok $package;
+
+my $origdir = getcwd;
+my $tempdir = tempdir( DIR => '.', CLEANUP => 1 );
+chdir( $tempdir );
 
 {
     my $session = tie my %session, $package, undef, {
@@ -35,7 +36,16 @@
     is ref($session->{unserialize}), 'CODE', 'unserialize is CODE';
 }
 
-{
+SKIP: {
+    skip "Cygserver is not running",5 
+     if $^O eq 'cygwin' && (!exists $ENV{'CYGWIN'} || $ENV{'CYGWIN'} !~ /server/i);
+    skip "Optional modules (IPC::Semaphore, IPC::SysV, MIME::Base64) not installed",5
+     unless eval {
+               require IPC::Semaphore;
+               require IPC::SysV;
+               require MIME::Base64;
+              };
+
     my $session = tie my %session, $package, undef, {
         Store     => 'DB_File',
         Lock      => 'Semaphore',

Modified: packages/libapache-session-perl/trunk/t/99md5gen.t
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libapache-session-perl/trunk/t/99md5gen.t?rev=4968&op=diff
==============================================================================
--- packages/libapache-session-perl/trunk/t/99md5gen.t (original)
+++ packages/libapache-session-perl/trunk/t/99md5gen.t Wed Mar 21 18:07:59 2007
@@ -9,14 +9,14 @@
                require Digest::MD5;
               };
 
-my $origdir = getcwd;
-my $tempdir = tempdir( DIR => '.', CLEANUP => 1 );
-chdir( $tempdir );
-
 plan tests => 33;
 
 my $package = 'Apache::Session::Generate::MD5';
 use_ok $package;
+
+#my $origdir = getcwd;
+#my $tempdir = tempdir( DIR => '.', CLEANUP => 1 );
+#chdir( $tempdir );
 
 my $session = {};
 
@@ -43,4 +43,4 @@
          "id is $length chars long";
 }
 
-chdir( $origdir );
+#chdir( $origdir );

Modified: packages/libapache-session-perl/trunk/t/99moduniqgen.t
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libapache-session-perl/trunk/t/99moduniqgen.t?rev=4968&op=diff
==============================================================================
--- packages/libapache-session-perl/trunk/t/99moduniqgen.t (original)
+++ packages/libapache-session-perl/trunk/t/99moduniqgen.t Wed Mar 21 18:07:59 2007
@@ -4,14 +4,14 @@
 use File::Temp qw[tempdir];
 use Cwd qw[getcwd];
 
-my $origdir = getcwd;
-my $tempdir = tempdir( DIR => '.', CLEANUP => 1 );
-chdir( $tempdir );
-
 plan tests => 4;
 
 my $package = 'Apache::Session::Generate::ModUniqueId';
 use_ok $package;
+
+my $origdir = getcwd;
+my $tempdir = tempdir( DIR => '.', CLEANUP => 1 );
+chdir( $tempdir );
 
 $ENV{UNIQUE_ID} = '12345678790abcdef';
 

Modified: packages/libapache-session-perl/trunk/t/99mysql.t
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libapache-session-perl/trunk/t/99mysql.t?rev=4968&op=diff
==============================================================================
--- packages/libapache-session-perl/trunk/t/99mysql.t (original)
+++ packages/libapache-session-perl/trunk/t/99mysql.t Wed Mar 21 18:07:59 2007
@@ -4,22 +4,22 @@
 use File::Temp qw[tempdir];
 use Cwd qw[getcwd];
 
+plan skip_all => "Not running RDBM tests without APACHE_SESSION_MAINTAINER=1"
+  unless $ENV{APACHE_SESSION_MAINTAINER};
 plan skip_all => "Optional modules (DBD::mysql, DBI) not installed"
   unless eval {
                require DBI;
                require DBD::mysql;
               };
-plan skip_all => "Not running RDBM tests without APACHE_SESSION_MAINTAINER=1"
-  unless $ENV{APACHE_SESSION_MAINTAINER};
-
-my $origdir = getcwd;
-my $tempdir = tempdir( DIR => '.', CLEANUP => 1 );
-chdir( $tempdir );
 
 plan tests => 13;
 
 my $package = 'Apache::Session::MySQL';
 use_ok $package;
+
+#my $origdir = getcwd;
+#my $tempdir = tempdir( DIR => '.', CLEANUP => 1 );
+#chdir( $tempdir );
 
 my $session = {};
 
@@ -101,4 +101,4 @@
 untie %{$session};
 $dbh->disconnect;
 
-chdir( $origdir );
+#chdir( $origdir );

Modified: packages/libapache-session-perl/trunk/t/99mysqllock.t
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libapache-session-perl/trunk/t/99mysqllock.t?rev=4968&op=diff
==============================================================================
--- packages/libapache-session-perl/trunk/t/99mysqllock.t (original)
+++ packages/libapache-session-perl/trunk/t/99mysqllock.t Wed Mar 21 18:07:59 2007
@@ -4,22 +4,22 @@
 use File::Temp qw[tempdir];
 use Cwd qw[getcwd];
 
+plan skip_all => "Not running RDBM tests without APACHE_SESSION_MAINTAINER=1"
+  unless $ENV{APACHE_SESSION_MAINTAINER};
 plan skip_all => "Optional modules (DBD::mysql, DBI) not installed"
   unless eval {
                require DBI;
                require DBD::mysql;
               };
-plan skip_all => "Not running RDBM tests without APACHE_SESSION_MAINTAINER=1"
-  unless $ENV{APACHE_SESSION_MAINTAINER};
-
-my $origdir = getcwd;
-my $tempdir = tempdir( DIR => '.', CLEANUP => 1 );
-chdir( $tempdir );
 
 plan tests => 4;
 
 my $package = 'Apache::Session::Lock::MySQL';
 use_ok $package;
+
+#my $origdir = getcwd;
+#my $tempdir = tempdir( DIR => '.', CLEANUP => 1 );
+#chdir( $tempdir );
 
 my $session = {
     args => {
@@ -66,4 +66,4 @@
 $sth2->finish;
 $dbh->disconnect;
 
-chdir( $origdir );
+#chdir( $origdir );

Modified: packages/libapache-session-perl/trunk/t/99mysqlstore.t
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libapache-session-perl/trunk/t/99mysqlstore.t?rev=4968&op=diff
==============================================================================
--- packages/libapache-session-perl/trunk/t/99mysqlstore.t (original)
+++ packages/libapache-session-perl/trunk/t/99mysqlstore.t Wed Mar 21 18:07:59 2007
@@ -4,17 +4,17 @@
 use File::Temp qw[tempdir];
 use Cwd qw[getcwd];
 
+plan skip_all => "Not running RDBM tests without APACHE_SESSION_MAINTAINER=1"
+  unless $ENV{APACHE_SESSION_MAINTAINER};
 plan skip_all => "Optional modules (DBD::mysql, DBI) not installed"
   unless eval {
                require DBI;
                require DBD::mysql;
               };
-plan skip_all => "Not running RDBM tests without APACHE_SESSION_MAINTAINER=1"
-  unless $ENV{APACHE_SESSION_MAINTAINER};
 
-my $origdir = getcwd;
-my $tempdir = tempdir( DIR => '.', CLEANUP => 1 );
-chdir( $tempdir );
+#my $origdir = getcwd;
+#my $tempdir = tempdir( DIR => '.', CLEANUP => 1 );
+#chdir( $tempdir );
 
 plan tests => 2;
 
@@ -25,4 +25,4 @@
 
 isa_ok $foo, $package;
 
-chdir( $origdir );
+#chdir( $origdir );

Modified: packages/libapache-session-perl/trunk/t/99nulllock.t
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libapache-session-perl/trunk/t/99nulllock.t?rev=4968&op=diff
==============================================================================
--- packages/libapache-session-perl/trunk/t/99nulllock.t (original)
+++ packages/libapache-session-perl/trunk/t/99nulllock.t Wed Mar 21 18:07:59 2007
@@ -9,9 +9,9 @@
                require Fcntl;
               };
 
-my $origdir = getcwd;
-my $tempdir = tempdir( DIR => '.', CLEANUP => 1 );
-chdir( $tempdir );
+#my $origdir = getcwd;
+#my $tempdir = tempdir( DIR => '.', CLEANUP => 1 );
+#chdir( $tempdir );
 
 plan tests => 4;
 
@@ -29,4 +29,4 @@
 
 undef $lock;
 
-chdir( $origdir );
+#chdir( $origdir );

Modified: packages/libapache-session-perl/trunk/t/99oracle.t
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libapache-session-perl/trunk/t/99oracle.t?rev=4968&op=diff
==============================================================================
--- packages/libapache-session-perl/trunk/t/99oracle.t (original)
+++ packages/libapache-session-perl/trunk/t/99oracle.t Wed Mar 21 18:07:59 2007
@@ -4,17 +4,17 @@
 use File::Temp qw[tempdir];
 use Cwd qw[getcwd];
 
+plan skip_all => "Not running RDBM tests without APACHE_SESSION_MAINTAINER=1"
+  unless $ENV{APACHE_SESSION_MAINTAINER};
 plan skip_all => "Optional modules (DBD::Oracle, DBI) not installed"
   unless eval {
                require DBI;
                require DBD::Oracle;
               };
-plan skip_all => "Not running RDBM tests without APACHE_SESSION_MAINTAINER=1"
-  unless $ENV{APACHE_SESSION_MAINTAINER};
 
-my $origdir = getcwd;
-my $tempdir = tempdir( DIR => '.', CLEANUP => 1 );
-chdir( $tempdir );
+#my $origdir = getcwd;
+#my $tempdir = tempdir( DIR => '.', CLEANUP => 1 );
+#chdir( $tempdir );
 
 plan tests => 13;
 
@@ -99,4 +99,4 @@
 $dbh->commit;
 $dbh->disconnect;
 
-chdir( $origdir );
+#chdir( $origdir );

Modified: packages/libapache-session-perl/trunk/t/99postgres.t
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libapache-session-perl/trunk/t/99postgres.t?rev=4968&op=diff
==============================================================================
--- packages/libapache-session-perl/trunk/t/99postgres.t (original)
+++ packages/libapache-session-perl/trunk/t/99postgres.t Wed Mar 21 18:07:59 2007
@@ -4,13 +4,13 @@
 use File::Temp qw[tempdir];
 use Cwd qw[getcwd];
 
+plan skip_all => "Not running RDBM tests without APACHE_SESSION_MAINTAINER=1"
+  unless $ENV{APACHE_SESSION_MAINTAINER};
 plan skip_all => "Optional modules (DBD::Pg, DBI) not installed"
   unless eval {
                require DBI;
                require DBD::Pg;
               };
-plan skip_all => "Not running RDBM tests without APACHE_SESSION_MAINTAINER=1"
-  unless $ENV{APACHE_SESSION_MAINTAINER};
 
 my $origdir = getcwd;
 my $tempdir = tempdir( DIR => '.', CLEANUP => 1 );

Modified: packages/libapache-session-perl/trunk/t/99semaphore.t
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libapache-session-perl/trunk/t/99semaphore.t?rev=4968&op=diff
==============================================================================
--- packages/libapache-session-perl/trunk/t/99semaphore.t (original)
+++ packages/libapache-session-perl/trunk/t/99semaphore.t Wed Mar 21 18:07:59 2007
@@ -4,20 +4,25 @@
 use File::Temp qw[tempdir];
 use Cwd qw[getcwd];
 
-plan skip_all => "Optional modules (IPC::SysV, IPC::Semaphore) not installed"
+BEGIN {
+ plan skip_all => "Optional modules (IPC::SysV, IPC::Semaphore) not installed"
   unless eval {
                require IPC::SysV;
                require IPC::Semaphore;
               };
-
-my $origdir = getcwd;
-my $tempdir = tempdir( DIR => '.', CLEANUP => 1 );
-chdir( $tempdir );
+ plan skip_all => "Cygserver is not running"
+  if $^O eq 'cygwin' && (!exists $ENV{'CYGWIN'} || $ENV{'CYGWIN'} !~ /server/i);
+}
 
 plan tests => 29;
 
 my $package = 'Apache::Session::Lock::Semaphore';
 use_ok $package;
+
+#my $origdir = getcwd;
+#my $tempdir = tempdir( DIR => '.', CLEANUP => 1 );
+#chdir( $tempdir );
+
 use IPC::SysV qw(IPC_CREAT S_IRWXU SEM_UNDO);
 use IPC::Semaphore;
 
@@ -80,4 +85,4 @@
     $sem->remove;
 }
 
-chdir( $origdir );
+#chdir( $origdir );

Modified: packages/libapache-session-perl/trunk/t/99storable.t
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libapache-session-perl/trunk/t/99storable.t?rev=4968&op=diff
==============================================================================
--- packages/libapache-session-perl/trunk/t/99storable.t (original)
+++ packages/libapache-session-perl/trunk/t/99storable.t Wed Mar 21 18:07:59 2007
@@ -9,14 +9,14 @@
                require Storable;
               };
 
-my $origdir = getcwd;
-my $tempdir = tempdir( DIR => '.', CLEANUP => 1 );
-chdir( $tempdir );
-
 plan tests => 2;
 
 my $package = 'Apache::Session::Serialize::Storable';
 use_ok $package;
+
+my $origdir = getcwd;
+my $tempdir = tempdir( DIR => '.', CLEANUP => 1 );
+chdir( $tempdir );
 
 
 my $serial   = \&Apache::Session::Serialize::Storable::serialize;

Modified: packages/libapache-session-perl/trunk/t/99uue.t
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libapache-session-perl/trunk/t/99uue.t?rev=4968&op=diff
==============================================================================
--- packages/libapache-session-perl/trunk/t/99uue.t (original)
+++ packages/libapache-session-perl/trunk/t/99uue.t Wed Mar 21 18:07:59 2007
@@ -9,14 +9,14 @@
                require Storable;
               };
 
-my $origdir = getcwd;
-my $tempdir = tempdir( DIR => '.', CLEANUP => 1 );
-chdir( $tempdir );
-
 plan tests => 2;
 
 my $package = 'Apache::Session::Serialize::UUEncode';
 use_ok $package;
+
+my $origdir = getcwd;
+my $tempdir = tempdir( DIR => '.', CLEANUP => 1 );
+chdir( $tempdir );
 
 my $serial = \&Apache::Session::Serialize::UUEncode::serialize;
 my $unserial = \&Apache::Session::Serialize::UUEncode::unserialize;




More information about the Pkg-perl-cvs-commits mailing list