From 296baf45a0b7e50e3cc01cf048db8298cd9529f6 Mon Sep 17 00:00:00 2001
From: Dan Fandrich <dan@coneharvesters.com>
Date: Thu, 18 May 2023 21:45:59 -0700
Subject: [PATCH] runtests: call initserverconfig() in the runner

This must be done so variables pick up the runner's unique $LOGDIR.

Ref: #10818
---
 tests/runner.pm   | 6 +++++-
 tests/runtests.pl | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/runner.pm b/tests/runner.pm
index 09467c2b6..d14e15806 100644
--- a/tests/runner.pm
+++ b/tests/runner.pm
@@ -89,6 +89,7 @@ use processhelp qw(
 use servers qw(
     checkcmd
     clearlocks
+    initserverconfig
     serverfortest
     stopserver
     stopservers
@@ -159,7 +160,7 @@ sub runner_init {
     $multiprocess = !!$jobs;
 
     # 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_FORCETIME'}=1; # for debug NTLM magic
     $ENV{'CURL_GLOBAL_INIT'}=1; # debug curl_global_init/cleanup use
@@ -202,6 +203,9 @@ sub runner_init {
             $LOGDIR = $logdir;
             mkdir("$LOGDIR/$PIDDIR", 0777);
 
+            # Initialize various server variables
+            initserverconfig();
+
             # handle IPC calls
             event_loop();
 
diff --git a/tests/runtests.pl b/tests/runtests.pl
index 2f13e8bdc..4f0fc379d 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -2371,6 +2371,7 @@ if(!$listonly) {
 
 #######################################################################
 # initialize configuration needed to set up servers
+# TODO: rearrange things so this can be called only in runner_init()
 #
 initserverconfig();