Reset environment variables before starting servers
Otherwise, variables from tests could affect the servers themselves.
This commit is contained in:
@@ -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
|
# test definition may instruct to (un)set environment vars
|
||||||
# this is done this early, so that the precheck can use environment
|
# this is done this early, so that the precheck can use environment
|
||||||
# variables and still bail out fine on errors
|
# variables and still bail out fine on errors
|
||||||
@@ -2374,6 +2364,16 @@ sub singletest {
|
|||||||
delete $oldenv{$var};
|
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");
|
my @setenv = getpart("client", "setenv");
|
||||||
if(@setenv) {
|
if(@setenv) {
|
||||||
foreach my $s (@setenv) {
|
foreach my $s (@setenv) {
|
||||||
|
|||||||
Reference in New Issue
Block a user