Merge pull request #3 from chorny/master

use Win32::Job to prevent segfault in tests
DrHyde · Apr 26, 2015 · 4dfb4e3 · 4dfb4e3
2 parents 1e9299a + 63069a9
commit 4dfb4e3
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 16 deletions.
diff --git a/Makefile.PL b/Makefile.PL
@@ -24,6 +24,7 @@ WriteMakefile(
     'File::Temp'            => 0.19,
     'Capture::Tiny'         => 0.05,
     'Devel::CheckOS'        => 1.52,
+    $^O eq 'MSWin32' ? ('Win32::Job' => 0,) : (),
   },
   dist => {
     DIST_CP => 'cp',

diff --git a/lib/CPAN/FindDependencies/MakeMaker.pm b/lib/CPAN/FindDependencies/MakeMaker.pm
@@ -58,23 +58,33 @@ sub getreqs_from_mm {
     print $MKFH $MakefilePL;
     close($MKFH);
 
-    # execute, suppressing noise ...
-    eval { capture {
-        if(my $pid = fork()) { # parent
-            local $SIG{ALRM} = sub {
-                kill 9, $pid; # quit RIGHT FUCKING NOW
-                die("Makefile.PL didn't finish in a reasonable time\n");
-            };
-            alarm(5);
-            waitpid($pid, 0);
-            alarm(0);
-        } else {
-            exec($Config{perlpath}, 'Makefile.PL');
+    if ($^O eq 'MSWin32') {
+        require Win32::Job;
+        my $job = Win32::Job->new;
+        $job->spawn($Config{perlpath}, "perl Makefile.PL", {stdin  => 'NUL', 'stdout'=>'stdout.log','stderr'=>'stderr.log'});
+        unless ($job->run(10)) {
+            chdir($cwd);
+            return "Makefile.PL didn't finish in a reasonable time\n";
+        }
+    } else {
+        # execute, suppressing noise ...
+        eval { capture {
+            if(my $pid = fork()) { # parent
+                local $SIG{ALRM} = sub {
+                    kill 9, $pid; # quit RIGHT FUCKING NOW
+                    die("Makefile.PL didn't finish in a reasonable time\n");
+                };
+                alarm(5);
+                waitpid($pid, 0);
+                alarm(0);
+            } else {
+                exec($Config{perlpath}, 'Makefile.PL');
+            }
+        } };
+        if($@) {
+            chdir($cwd);
+            return $@;
         }
-    } };
-    if($@) {
-        chdir($cwd);
-	return $@;
     }
 
     # read Makefile