Reset environment variables before starting servers

Otherwise, variables from tests could affect the servers
themselves.
This commit is contained in:
Dan Fandrich 2010-08-13 22:14:26 -07:00
parent a6e088e855
commit 72da720b4a
1 changed files with 10 additions and 10 deletions

View File

@ -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) {