X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=t%2Flib%2FApp%2FRgit%2FTestUtils.pm;h=b736a5d6c0001171a0b72bde2eb6ca35628b5072;hb=HEAD;hp=07b1bd7c4e5212260a9f9dcdf3c243cf7fe133b6;hpb=e09a125b42420241c34529697c250ad795f1c59e;p=perl%2Fmodules%2Frgit.git

diff --git a/t/lib/App/Rgit/TestUtils.pm b/t/lib/App/Rgit/TestUtils.pm
index 07b1bd7..b736a5d 100644
--- a/t/lib/App/Rgit/TestUtils.pm
+++ b/t/lib/App/Rgit/TestUtils.pm
@@ -3,46 +3,48 @@ package App::Rgit::TestUtils;
 use strict;
 use warnings;
 
-use Cwd        qw/abs_path/;
-use File::Temp qw/tempfile/;
-use POSIX      qw/WIFEXITED WEXITSTATUS WIFSIGNALED WTERMSIG SIGINT SIGQUIT/;
+use Cwd        qw<abs_path>;
+use File::Temp qw<tempfile>;
+use File::Spec (); # curdir, catfile
+use POSIX      qw<WIFEXITED WEXITSTATUS WIFSIGNALED WTERMSIG>;
 
 BEGIN {
  no warnings 'redefine';
  *WIFEXITED   = sub { 1 }             unless eval { WIFEXITED(0);   1 };
  *WEXITSTATUS = sub { shift() >> 8 }  unless eval { WEXITSTATUS(0); 1 };
  *WIFSIGNALED = sub { shift() & 127 } unless eval { WIFSIGNALED(0); 1 };
+ *WTERMSIG    = sub { shift() & 127 } unless eval { WTERMSIG(0);    1 };
 }
 
-use base qw/Exporter/;
+use base qw<Exporter>;
 
-our @EXPORT_OK = (qw/can_run_git/);
+our @EXPORT_OK = (qw<can_run_git>);
 
 sub can_run_git {
  my ($fh, $filename) = tempfile(UNLINK => 1);
 
  my @ret = (1, '');
 
-CHECK:
+TRY:
  {
   my @args = (
    abs_path($filename),
    'version',
   );
 
-  my $git = 't/bin/git';
+  my $git = File::Spec->catfile(File::Spec->curdir, qw<t bin git>);
   if ($^O eq 'MSWin32') {
    unless (-x $git) {
     $git .= '.bat';
     unless (-x $git) {
      @ret = (0, "no $git executable");
-     last CHECK;
+     last TRY;
     }
    }
   } else {
    unless (-x $git) {
     @ret = (0, "no $git executable");
-    last CHECK;
+    last TRY;
    }
   }
 
@@ -50,7 +52,7 @@ CHECK:
 
   if ($? == -1) {
    @ret = (0, $! || "unknown");
-   last CHECK;
+   last TRY;
   }
 
   my $status;