Bug #26533 for Apache-SessionX: DB_File test hangs on Win32

On Apr 26 08:19:08 2007, richter AT ecos.de wrote: Show quoted text
Wrote two patches. SessionX.pm - internal check to handle "Can't use string ("") as a subroutine ref". test.pl - Perl on Windows now supports alarm. And Windows shell does not support `testcount.pl &`, so this test should be skipped. -- Alexandr Ciornii, http://chorny.net

--- SessionX.pm.dist Thu Nov 10 07:20:07 2005 +++ SessionX.pm Sat Apr 28 17:52:44 2007 @@ -126,6 +126,7 @@ if (!$session_id && $self -> {idfrom}) { + die "No generator provided" unless $self->{generate}; $session_id = $self->{data}->{_session_id} = &{$self->{generate}}($self, $self -> {idfrom}) ; }

--- test.pl.dist Sat Apr 28 18:29:45 2007 +++ test.pl Sat Apr 28 18:31:17 2007 @@ -9,9 +9,9 @@ BEGIN { eval "use Time::HiRes qw(gettimeofday tv_interval) ;" ; } use strict ; -use vars qw(@tests %stdargs $timeout $errors $numprocs $win32) ; +use vars qw(@tests %stdargs $timeout $errors $numprocs $has_alarm) ; -$win32 = ($Config{osname} =~ /win32/i) ; +$has_alarm = defined $Config{d_alarm}?1:0; if (@ARGV) { @@ -137,9 +137,9 @@ { local $SIG{ALRM} = sub { Error ("Time out. Locking not working properly") } ; - alarm $timeout if (!$win32) ; + alarm $timeout if ($has_alarm) ; dosimpletest (@_) ; - alarm 0 if (!$win32) ; + alarm 0 if ($has_alarm) ; } @@ -265,9 +265,9 @@ { local $SIG{ALRM} = sub { Error ("Time out. Locking not working properly") } ; - alarm $timeout if (!$win32) ; + alarm $timeout if ($has_alarm) ; dopersisttest (@_) ; - alarm 0 if (!$win32) ; + alarm 0 if ($has_alarm) ; } @@ -299,9 +299,9 @@ { local $SIG{ALRM} = sub { Error ("Time out. Locking not working properly") ; } ; - alarm $timeout if (!$win32) ; + alarm $timeout if ($has_alarm) ; dofailtest (@_) ; - alarm 0 if (!$win32) ; + alarm 0 if ($has_alarm) ; } sub preopen @@ -337,7 +337,11 @@ my $cnt ; printf ('#%02d %-30s', $num, "$msg...\n") ; + return '' if $^O eq 'MSWin32'; + #This test is OS-specific, it executes `testcount.pl &` + local $SIG{ALRM} = sub { Error ("Time out.");die; }; + alarm $timeout*10 if ($has_alarm) ; my %sess ; my $obj ; eval { $obj = tie (%sess, 'Apache::SessionX', undef, { %stdargs, 'config' => $cfg, lazy => 1, create_unknown => 1, Transaction => 1}) or die ("Cannot tie to Apache::SessionX") ; } ; @@ -379,6 +383,7 @@ print "\n" ; Error ("Count is $cnt should be " . ($numprocs * 10) . ". Looks like locking doesn't work correct") ; + alarm 0 if ($has_alarm) ; } @@ -464,6 +469,7 @@ if ($errors) { print "Found $errors ERRORS\n" ; + die; #Installation tools will be able to detect FAIL } else {