aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Fandrich <dan@coneharvesters.com>2010-08-13 22:14:26 -0700
committerDan Fandrich <dan@coneharvesters.com>2010-08-13 22:14:26 -0700
commit72da720b4a647494ae21700dba4fdb94936827e9 (patch)
tree08a2de109a838c0c0373059fae85e9c56438c60b
parenta6e088e85540d1be98f5fccffea4fca38fe47ccb (diff)
Reset environment variables before starting servers
Otherwise, variables from tests could affect the servers themselves.
-rwxr-xr-xtests/runtests.pl20
1 files changed, 10 insertions, 10 deletions
diff --git a/tests/runtests.pl b/tests/runtests.pl
index 9ddccc084..2a10e5f7b 100755
--- 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) {