From c74875d94e9fee0c3778ea4d3896961ceab16a53 Mon Sep 17 00:00:00 2001
From: Yang Tse <yangsita@gmail.com>
Date: Wed, 23 Dec 2009 15:20:20 +0000
Subject: 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.

---
 tests/runtests.pl | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'tests/runtests.pl')

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
-- 
cgit v1.2.3