Test harness process control enhancements

3 files changed, 7 insertions, 3 deletions

diff --git a/tests/ftp.pm b/tests/ftp.pm
index 28bbb4ea6..1b45014a6 100644
--- a/tests/ftp.pm
+++ b/tests/ftp.pm
@@ -85,7 +85,11 @@ sub killpid {
     # stop it, otherwise reap it if this has not been done yet.
     my @signalled;
     my $prev = 0;
-    my @pids = sort({$a <=> $b} split(/\s+/, $pidlist));
+    my @pids = split(' ', $pidlist);
+    if(scalar(@pids) > 2) {
+        my @sorted = sort({$a <=> $b} @pids);
+        @pids = @sorted;
+    }
     foreach my $tmp (@pids) {
         chomp $tmp;
         if($tmp =~ /^(\d+)$/) {
diff --git a/tests/runtests.pl b/tests/runtests.pl
index ace609f72..33def4d91 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -2518,7 +2518,7 @@ sub stopservers {
         my $pid;
         my $prev;
 
-        foreach $pid (split(/\s+/, $pids)) {
+        foreach $pid (split(' ', $pids)) {
             if($pid != $prev) {
                 # no need to kill same pid twice!
                 logmsg sprintf("* kill pid for %s => %d\n",
diff --git a/tests/server/sws.c b/tests/server/sws.c
index 00fd74fe1..5970f470c 100644
--- a/tests/server/sws.c
+++ b/tests/server/sws.c
@@ -927,7 +927,7 @@ static int send_doc(curl_socket_t sock, struct httprequest *req)
       logmsg("Sent off %zd bytes", written);
     }
     /* write to file as well */
-    fwrite(buffer, 1, written, dump);
+    fwrite(buffer, 1, (size_t)written, dump);
     if(got_exit_signal)
       break;