From: Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>
Date: Fri, 21 Jun 2013 14:58:18 +0000 (+0100)
Subject: Don't try to run pperl --kill if we didn't find PPerl
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=53a5200d634aaff6ed5663158f9df69c4f622205;p=dbsrgits%2FDBIx-Class-Historic.git

Don't try to run pperl --kill if we didn't find PPerl

There might be an unrelated pperl binary in the user's path, so avoid
running it unless we actually have PPerl.pm installed
---

diff --git a/t/52leaks.t b/t/52leaks.t
index 4bc48ab..9f8c71a 100644
--- a/t/52leaks.t
+++ b/t/52leaks.t
@@ -472,8 +472,11 @@ SKIP: {
   require IPC::Open2;
 
   for my $type (keys %$persistence_tests) { SKIP: {
-      skip "$type module not found", 1
-        unless eval "require $type";
+    unless (eval "require $type") {
+      # Don't terminate what we didn't start
+      delete $persistence_tests->{$type}{termcmd};
+      skip "$type module not found", 1;
+    }
 
     my @cmd = @{$persistence_tests->{$type}{cmd}};
 
@@ -517,6 +520,7 @@ END {
   unless ($ENV{DBICTEST_IN_PERSISTENT_ENV}) {
     close $_ for (*STDIN, *STDOUT, *STDERR);
     local $?; # otherwise test will inherit $? of the system()
-    system (@{$persistence_tests->{PPerl}{termcmd}});
+    system (@{$persistence_tests->{PPerl}{termcmd}})
+      if $persistence_tests->{PPerl}{termcmd};
   }
 }