Back out some pingpong server stopping changes introduced last week in

order to re-use 'classic' stopping and allow taking test-suite run time
references from this state.

1 files changed, 5 insertions, 5 deletions

diff --git a/tests/runtests.pl b/tests/runtests.pl
index 536f604f8..189d64cab 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -2277,6 +2277,11 @@ sub singletest {
     my @killservers = getpart("client", "killserver");
     foreach my $serv (@killservers) {
         chomp $serv;
+        if($serv =~ /^ftp(\d*)(-ipv6|)/) {
+            my ($id, $ext) = ($1, $2);
+            #print STDERR "SERV $serv $id $ext\n";
+            ftpkillslave($id, $ext, $verbose);
+        }
         if($run{$serv}) {
             stopserver($run{$serv}); # the pid file is in the hash table
             $run{$serv}=0; # clear pid
@@ -2284,11 +2289,6 @@ sub singletest {
         else {
             logmsg "RUN: The $serv server is not running\n";
         }
-        if($serv =~ /^ftp(\d*)(-ipv6|)/) {
-            my ($id, $ext) = ($1, $2);
-            #print STDERR "SERV $serv $id $ext\n";
-            ftpkillslave($id, $ext, $verbose);
-        }
     }
 
     # remove the test server commands file after each test