From: Marc Hoersken <info@marc-hoersken.de>
Date: Sat, 6 Apr 2013 09:56:04 +0000 (+0200)
Subject: ftp.pm: Made Perl testsuite able to handle Windows processes
X-Git-Tag: curl-7_30_0~40
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ac09b5a92bec0da6109b58856094229a77df5eb8;p=thirdparty%2Fcurl.git

ftp.pm: Made Perl testsuite able to handle Windows processes
---

diff --git a/tests/ftp.pm b/tests/ftp.pm
index ae41849d89..b38745120a 100644
--- a/tests/ftp.pm
+++ b/tests/ftp.pm
@@ -63,6 +63,14 @@ sub processexists {
     my $pid = pidfromfile($pidfile);
 
     if($pid > 0) {
+        # verify if currently existing Windows process
+        if($^O eq "msys") {
+            my $filter = "-fi \"PID eq $pid\"";
+            my $result = `tasklist $filter 2>nul`;
+            if(index($result, "$pid") != -1) {
+                return $pid;
+            }
+        }
         # verify if currently alive
         if(kill(0, $pid)) {
             return $pid;
@@ -222,6 +230,13 @@ sub killsockfilters {
             printf("* kill pid for %s-%s => %d\n", $server,
                 ($proto eq 'ftp')?'ctrl':'filt', $pid) if($verbose);
             kill("KILL", $pid);
+            if($^O eq "msys") {
+                my $filter = "-fi \"PID eq $pid\"";
+                my $result = `tasklist $filter 2>nul`;
+                if(index($result, "$pid") != -1) {
+                    system("taskkill -f $filter >nul 2>&1");
+                }
+            }
             waitpid($pid, 0);
         }
         unlink($pidfile) if(-f $pidfile);
@@ -236,6 +251,13 @@ sub killsockfilters {
             printf("* kill pid for %s-data => %d\n", $server,
                 $pid) if($verbose);
             kill("KILL", $pid);
+            if($^O eq "msys") {
+                my $filter = "-fi \"PID eq $pid\"";
+                my $result = `tasklist $filter 2>nul`;
+                if(index($result, "$pid") != -1) {
+                    system("taskkill -f $filter >nul 2>&1");
+                }
+            }
             waitpid($pid, 0);
         }
         unlink($pidfile) if(-f $pidfile);