diff options
Diffstat (limited to 'zenutil/zenserverprocess.cpp')
| -rw-r--r-- | zenutil/zenserverprocess.cpp | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/zenutil/zenserverprocess.cpp b/zenutil/zenserverprocess.cpp index 659eb665b..5ecde343b 100644 --- a/zenutil/zenserverprocess.cpp +++ b/zenutil/zenserverprocess.cpp @@ -397,8 +397,12 @@ ZenServerEnvironment::Initialize(std::filesystem::path ProgramBaseDir) } void -ZenServerEnvironment::InitializeForTest(std::filesystem::path ProgramBaseDir, std::filesystem::path TestBaseDir) +ZenServerEnvironment::InitializeForTest(std::filesystem::path ProgramBaseDir, + std::filesystem::path TestBaseDir, + std::string_view ServerClass) { + using namespace std::literals; + m_ProgramBaseDir = ProgramBaseDir; m_TestBaseDir = TestBaseDir; @@ -408,6 +412,19 @@ ZenServerEnvironment::InitializeForTest(std::filesystem::path ProgramBaseDir, st m_IsTestInstance = true; m_IsInitialized = true; + + if (ServerClass.empty()) + { +#if ZEN_WITH_HTTPSYS + m_ServerClass = "httpsys"sv; +#else + m_ServerClass = "asio"sv; +#endif + } + else + { + m_ServerClass = ServerClass; + } } std::filesystem::path @@ -516,6 +533,11 @@ ZenServerInstance::SpawnServer(int BasePort, std::string_view AdditionalServerAr CommandLine << " --child-id " << ChildEventName; + if (std::string_view ServerClass = m_Env.GetServerClass(); ServerClass.empty() == false) + { + CommandLine << " --http " << ServerClass; + } + if (BasePort) { CommandLine << " --port " << BasePort; |