Reset environment variables before starting servers

Otherwise, variables from tests could affect the servers
themselves.

diff --git a/tests/runtests.pl b/tests/runtests.pl
index 9ddccc08461db0a5bbcfe37efce403041f879291..2a10e5f7b5560ebb70075c13dc9ebc4280c3228a 100755 (executable)
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -2349,16 +2349,6 @@ sub singletest {
         }
     }
 
-    # timestamp required servers verification start
-    $timesrvrini{$testnum} = Time::HiRes::time() if($timestats);
-
-    if(!$why) {
-        $why = serverfortest($testnum);
-    }
-
-    # timestamp required servers verification end
-    $timesrvrend{$testnum} = Time::HiRes::time() if($timestats);
-
     # test definition may instruct to (un)set environment vars
     # this is done this early, so that the precheck can use environment
     # variables and still bail out fine on errors
@@ -2374,6 +2364,16 @@ sub singletest {
         delete $oldenv{$var};
     }
 
+    # timestamp required servers verification start
+    $timesrvrini{$testnum} = Time::HiRes::time() if($timestats);
+
+    if(!$why) {
+        $why = serverfortest($testnum);
+    }
+
+    # timestamp required servers verification end
+    $timesrvrend{$testnum} = Time::HiRes::time() if($timestats);
+
     my @setenv = getpart("client", "setenv");
     if(@setenv) {
         foreach my $s (@setenv) {