runtests: call initserverconfig() in the runner
This must be done so variables pick up the runner's unique $LOGDIR. Ref: #10818
This commit is contained in:
Родитель
78d8bc4c63
Коммит
296baf45a0
|
@ -89,6 +89,7 @@ use processhelp qw(
|
||||||
use servers qw(
|
use servers qw(
|
||||||
checkcmd
|
checkcmd
|
||||||
clearlocks
|
clearlocks
|
||||||
|
initserverconfig
|
||||||
serverfortest
|
serverfortest
|
||||||
stopserver
|
stopserver
|
||||||
stopservers
|
stopservers
|
||||||
|
@ -159,7 +160,7 @@ sub runner_init {
|
||||||
$multiprocess = !!$jobs;
|
$multiprocess = !!$jobs;
|
||||||
|
|
||||||
# enable memory debugging if curl is compiled with it
|
# enable memory debugging if curl is compiled with it
|
||||||
$ENV{'CURL_MEMDEBUG'} = "$LOGDIR/$MEMDUMP";
|
$ENV{'CURL_MEMDEBUG'} = "$logdir/$MEMDUMP";
|
||||||
$ENV{'CURL_ENTROPY'}="12345678";
|
$ENV{'CURL_ENTROPY'}="12345678";
|
||||||
$ENV{'CURL_FORCETIME'}=1; # for debug NTLM magic
|
$ENV{'CURL_FORCETIME'}=1; # for debug NTLM magic
|
||||||
$ENV{'CURL_GLOBAL_INIT'}=1; # debug curl_global_init/cleanup use
|
$ENV{'CURL_GLOBAL_INIT'}=1; # debug curl_global_init/cleanup use
|
||||||
|
@ -202,6 +203,9 @@ sub runner_init {
|
||||||
$LOGDIR = $logdir;
|
$LOGDIR = $logdir;
|
||||||
mkdir("$LOGDIR/$PIDDIR", 0777);
|
mkdir("$LOGDIR/$PIDDIR", 0777);
|
||||||
|
|
||||||
|
# Initialize various server variables
|
||||||
|
initserverconfig();
|
||||||
|
|
||||||
# handle IPC calls
|
# handle IPC calls
|
||||||
event_loop();
|
event_loop();
|
||||||
|
|
||||||
|
|
|
@ -2371,6 +2371,7 @@ if(!$listonly) {
|
||||||
|
|
||||||
#######################################################################
|
#######################################################################
|
||||||
# initialize configuration needed to set up servers
|
# initialize configuration needed to set up servers
|
||||||
|
# TODO: rearrange things so this can be called only in runner_init()
|
||||||
#
|
#
|
||||||
initserverconfig();
|
initserverconfig();
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче