Repurposing test utility code to enable server control via zen

9 files changed, 32 insertions, 20 deletions

diff --git a/zen.sln b/zen.sln
index b581424bd..b9d2e3ed8 100644
--- a/zen.sln
+++ b/zen.sln
@@ -41,7 +41,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zenserver-test", "zenserver
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zenstore", "zenstore\zenstore.vcxproj", "{26CBBAEB-14C1-4EFC-877D-80F48215651C}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zentestutil", "zentestutil\zentestutil.vcxproj", "{77F8315D-B21D-4DB0-9A6F-2D3359F88A70}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zenutil", "zenutil\zenutil.vcxproj", "{77F8315D-B21D-4DB0-9A6F-2D3359F88A70}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zentest-appstub", "zentest-appstub\zentest-appstub.vcxproj", "{7FFC7E77-D038-44E9-8D84-41918C355F29}"
 EndProject
diff --git a/zen/zen.vcxproj b/zen/zen.vcxproj
index 5356e9480..78f978ba5 100644
--- a/zen/zen.vcxproj
+++ b/zen/zen.vcxproj
@@ -68,7 +68,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\zencore\include;..\zenstore\include;..\zentestutil\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\zencore\include;..\zenstore\include;..\zenutil\include</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
@@ -84,7 +84,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\zencore\include;..\zenstore\include;..\zentestutil\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\zencore\include;..\zenstore\include;..\zenutil\include</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
@@ -101,7 +101,9 @@
     <ClCompile Include="cmds\deploy.cpp" />
     <ClCompile Include="cmds\hash.cpp" />
     <ClCompile Include="cmds\run.cpp" />
+    <ClCompile Include="cmds\status.cpp" />
     <ClCompile Include="cmds\top.cpp" />
+    <ClCompile Include="cmds\up.cpp" />
     <ClCompile Include="internalfile.cpp" />
     <ClCompile Include="zen.cpp" />
   </ItemGroup>
@@ -112,7 +114,9 @@
     <ClInclude Include="cmds\deploy.h" />
     <ClInclude Include="cmds\hash.h" />
     <ClInclude Include="cmds\run.h" />
+    <ClInclude Include="cmds\status.h" />
     <ClInclude Include="cmds\top.h" />
+    <ClInclude Include="cmds\up.h" />
     <ClInclude Include="internalfile.h" />
     <ClInclude Include="zen.h" />
   </ItemGroup>
@@ -123,7 +127,7 @@
     <ProjectReference Include="..\zenstore\zenstore.vcxproj">
       <Project>{26cbbaeb-14c1-4efc-877d-80f48215651c}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\zentestutil\zentestutil.vcxproj">
+    <ProjectReference Include="..\zenutil\zenutil.vcxproj">
       <Project>{77f8315d-b21d-4db0-9a6f-2d3359f88a70}</Project>
     </ProjectReference>
   </ItemGroup>
diff --git a/zen/zen.vcxproj.filters b/zen/zen.vcxproj.filters
index 1112cbbf7..17c9da9c1 100644
--- a/zen/zen.vcxproj.filters
+++ b/zen/zen.vcxproj.filters
@@ -22,6 +22,10 @@
     <ClCompile Include="cmds\top.cpp">
       <Filter>cmds</Filter>
     </ClCompile>
+    <ClCompile Include="cmds\status.cpp">
+      <Filter>cmds</Filter>
+    </ClCompile>
+    <ClCompile Include="cmds\up.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="chunk\chunk.h" />
@@ -45,6 +49,10 @@
     <ClInclude Include="cmds\top.h">
       <Filter>cmds</Filter>
     </ClInclude>
+    <ClInclude Include="cmds\status.h">
+      <Filter>cmds</Filter>
+    </ClInclude>
+    <ClInclude Include="cmds\up.h" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="cmds">
diff --git a/zenserver-test/zenserver-test.cpp b/zenserver-test/zenserver-test.cpp
index a59807ebe..7a2031508 100644
--- a/zenserver-test/zenserver-test.cpp
+++ b/zenserver-test/zenserver-test.cpp
@@ -643,7 +643,7 @@ main()
 }
 #else
 
-ZenTestEnvironment TestEnv;
+ZenServerEnvironment TestEnv;
 
 int
 main(int argc, char** argv)
diff --git a/zenserver-test/zenserver-test.vcxproj b/zenserver-test/zenserver-test.vcxproj
index 3d5a37ac8..d54f23b72 100644
--- a/zenserver-test/zenserver-test.vcxproj
+++ b/zenserver-test/zenserver-test.vcxproj
@@ -71,7 +71,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(SolutionDir)\zentestutil\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)\zenutil\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -86,7 +86,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(SolutionDir)\zentestutil\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)\zenutil\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -99,7 +99,7 @@
     <ProjectReference Include="..\zencore\zencore.vcxproj">
       <Project>{d75bf9ab-c61e-4fff-ad59-1563430f05e2}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\zentestutil\zentestutil.vcxproj">
+    <ProjectReference Include="..\zenutil\zenutil.vcxproj">
       <Project>{77f8315d-b21d-4db0-9a6f-2d3359f88a70}</Project>
     </ProjectReference>
   </ItemGroup>
diff --git a/zentestutil/include/zenserverprocess.h b/zenutil/include/zenserverprocess.h
index db905b6e7..fbe48abe3 100644
--- a/zentestutil/include/zenserverprocess.h
+++ b/zenutil/include/zenserverprocess.h
@@ -8,11 +8,11 @@
 
 #include <filesystem>
 
-class ZenTestEnvironment
+class ZenServerEnvironment
 {
 public:
-	ZenTestEnvironment();
-	~ZenTestEnvironment();
+	ZenServerEnvironment();
+	~ZenServerEnvironment();
 
 	void Initialize(std::filesystem::path ProgramBaseDir, std::filesystem::path TestBaseDir);
 
@@ -29,7 +29,7 @@ private:
 
 struct ZenServerInstance
 {
-	ZenServerInstance(ZenTestEnvironment& TestEnvironment);
+	ZenServerInstance(ZenServerEnvironment& TestEnvironment);
 	~ZenServerInstance();
 
 	void SignalShutdown() { m_ShutdownEvent.Set(); }
@@ -46,7 +46,7 @@ struct ZenServerInstance
 	void SpawnServer(int BasePort);
 
 private:
-	ZenTestEnvironment&	  m_Env;
+	ZenServerEnvironment&	  m_Env;
 	zen::ProcessHandle	  m_Process;
 	zen::Event			  m_ReadyEvent;
 	zen::Event			  m_ShutdownEvent;
diff --git a/zentestutil/zenserverprocess.cpp b/zenutil/zenserverprocess.cpp
index 9961c6151..f58a9f166 100644
--- a/zentestutil/zenserverprocess.cpp
+++ b/zenutil/zenserverprocess.cpp
@@ -12,16 +12,16 @@
 
 std::atomic<int> TestCounter{0};
 
-ZenTestEnvironment::ZenTestEnvironment()
+ZenServerEnvironment::ZenServerEnvironment()
 {
 }
 
-ZenTestEnvironment::~ZenTestEnvironment()
+ZenServerEnvironment::~ZenServerEnvironment()
 {
 }
 
 void
-ZenTestEnvironment::Initialize(std::filesystem::path ProgramBaseDir, std::filesystem::path TestBaseDir)
+ZenServerEnvironment::Initialize(std::filesystem::path ProgramBaseDir, std::filesystem::path TestBaseDir)
 {
 	m_ProgramBaseDir = ProgramBaseDir;
 	m_TestBaseDir	 = TestBaseDir;
@@ -34,7 +34,7 @@ ZenTestEnvironment::Initialize(std::filesystem::path ProgramBaseDir, std::filesy
 }
 
 std::filesystem::path
-ZenTestEnvironment::CreateNewTestDir()
+ZenServerEnvironment::CreateNewTestDir()
 {
 	using namespace std::literals;
 
@@ -51,7 +51,7 @@ ZenTestEnvironment::CreateNewTestDir()
 }
 
 std::filesystem::path
-ZenTestEnvironment::RootDir(std::string_view Path)
+ZenServerEnvironment::RootDir(std::string_view Path)
 {
 	std::filesystem::path Root = m_ProgramBaseDir.parent_path().parent_path();
 
@@ -64,7 +64,7 @@ ZenTestEnvironment::RootDir(std::string_view Path)
 
 std::atomic<int> ChildIdCounter{0};
 
-ZenServerInstance::ZenServerInstance(ZenTestEnvironment& TestEnvironment) : m_Env(TestEnvironment)
+ZenServerInstance::ZenServerInstance(ZenServerEnvironment& TestEnvironment) : m_Env(TestEnvironment)
 {
 	ZEN_ASSERT(TestEnvironment.IsInitialized());
 }
diff --git a/zentestutil/zentestutil.vcxproj b/zenutil/zenutil.vcxproj
index 6b0656759..c851d5ec6 100644
--- a/zentestutil/zentestutil.vcxproj
+++ b/zenutil/zenutil.vcxproj
@@ -14,7 +14,7 @@
     <VCProjectVersion>16.0</VCProjectVersion>
     <Keyword>Win32Proj</Keyword>
     <ProjectGuid>{77f8315d-b21d-4db0-9a6f-2d3359f88a70}</ProjectGuid>
-    <RootNamespace>zentestutil</RootNamespace>
+    <RootNamespace>zenutil</RootNamespace>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
diff --git a/zentestutil/zentestutil.vcxproj.filters b/zenutil/zenutil.vcxproj.filters
index ca1414842..ca1414842 100644
--- a/zentestutil/zentestutil.vcxproj.filters
+++ b/zenutil/zenutil.vcxproj.filters