When running subprocesses in client tests, use test runner's perl and…

… gearmand instead of environment's git-svn-id: http://code.sixapart.com/svn/gearman/trunk@484 011c6a6d-750f-0410-a5f6-93fdcd050bc4
gearman · May 17, 2011 · 75d9508 · 75d9508
1 parent 8355b57
commit 75d9508
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/t/TestGearman.pm b/t/TestGearman.pm
@@ -5,6 +5,7 @@ use strict;
 use List::Util qw(first);;
 use IO::Socket::INET;
 use POSIX qw( :sys_wait_h );
+use File::Basename 'dirname';
 
 our $Bin;
 use FindBin qw( $Bin );
@@ -22,6 +23,7 @@ sub start_server {
     my($port) = @_;
     my @loc = ("$Bin/../../../../server/gearmand",     # using svn
                "$Bin/../../../../../server/gearmand",  # using svn and 'disttest'
+               dirname($^X) . '/gearmand',     # local installs (e.g. perlbrew)
                '/usr/bin/gearmand',            # where some distros might put it
                '/usr/sbin/gearmand',           # where other distros might put it
                );

diff --git a/t/allinone.t b/t/allinone.t
@@ -12,7 +12,7 @@ use Gearman::Server;
 use Gearman::Client::Async;
 
 my $server = Gearman::Server->new();
-$server->start_worker('t/worker.pl');
+$server->start_worker(sub { exec $^X, 't/worker.pl' });
 
 my $client = Gearman::Client::Async->new(job_servers => [ $server ]);
 

diff --git a/t/lib/GearTestLib.pm b/t/lib/GearTestLib.pm
@@ -3,6 +3,7 @@ use strict;
 use IO::Socket::INET;
 use Exporter 'import';
 use FindBin;
+use File::Basename 'dirname';
 use Carp qw(croak);
 use vars qw(@EXPORT);
 
@@ -33,7 +34,7 @@ sub start_child {
     my $pid = fork();
     die $! unless defined $pid;
     unless ($pid) {
-        exec 'perl', '-Iblib/lib', '-Ilib', @$cmd or die $!;
+        exec $^X, '-Iblib/lib', '-Ilib', @$cmd or die $!;
     }
     $pid;
 }
@@ -48,6 +49,7 @@ sub new {
     my $port = GearTestLib::free_port(++$requested_port);
 
     my @loc = ("$FindBin::Bin/../../../../server/gearmand",  # using svn
+               dirname($^X) . '/gearmand',     # local installs (e.g. perlbrew)
                '/usr/bin/gearmand',            # where some distros might put it
                '/usr/sbin/gearmand',           # where other distros might put it
                );

diff --git a/t/lib/testlib.pl b/t/lib/testlib.pl
@@ -17,6 +17,7 @@
 use POSIX qw( :sys_wait_h );
 use List::Util qw(first);;
 use IO::Socket::INET;
+use File::Basename 'dirname';
 
 Danga::Socket->SetLoopTimeout(100);
 
@@ -28,6 +29,7 @@ sub start_server {
     my($port) = @_;
     my @loc = ("$Bin/../../../../server/gearmand",    # using svn
                "$Bin/../../../../../server/gearmand", # using svn, with disttest
+               dirname($^X) . '/gearmand',     # local installs (e.g. perlbrew)
                '/usr/bin/gearmand',            # where some distros might put it
                '/usr/sbin/gearmand',           # where other distros might put it
                );
@@ -56,7 +58,7 @@ sub start_child {
     my $pid = fork();
     die $! unless defined $pid;
     unless ($pid) {
-        exec 'perl', '-Iblib/lib', '-Ilib', @$cmd or die $!;
+        exec $^X, '-Iblib/lib', '-Ilib', @$cmd or die $!;
     }
     $pid;
 }