Internal. Stabilize tests

ShellProcessor takes into account detected bitness, which is mocked as 32bit
Maximus5 · Apr 17, 2022 · bf24287 · bf24287
1 parent ab8b563
commit bf24287
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/ConEmuHk/ShellProcessor_test.cpp b/src/ConEmuHk/ShellProcessor_test.cpp
@@ -218,12 +218,12 @@ TEST_F(ShellProcessor, Far300)
 		{Function::CreateW,
 			nullptr, LR"(""C:\1 @\a.cmd"")",
 			nullptr,
-			LR"("%ConEmuBaseDirTest%\)" ConEmuC_EXE_3264 R"(" %ConEmuLogTest%/PARENTFARPID=%ConEmuTestPid% /C ""C:\1 @\a.cmd"")"},
+			LR"("%ConEmuBaseDirTest%\)" ConEmuC_32_EXE R"(" %ConEmuLogTest%/PARENTFARPID=%ConEmuTestPid% /C ""C:\1 @\a.cmd"")"},
 
 		{Function::CreateW,
 			LR"(C:\1 @\a.cmd)", nullptr, // important to have two double quotes, otherwise cmd will strip one and fail to find the file
 			nullptr,
-			LR"("%ConEmuBaseDirTest%\)" ConEmuC_EXE_3264 R"(" %ConEmuLogTest%/PARENTFARPID=%ConEmuTestPid% /C ""C:\1 @\a.cmd"")"},
+			LR"("%ConEmuBaseDirTest%\)" ConEmuC_32_EXE R"(" %ConEmuLogTest%/PARENTFARPID=%ConEmuTestPid% /C ""C:\1 @\a.cmd"")"},
 
 		// #TODO: Add DosBox mock/test
 		{Function::CreateW,
@@ -300,7 +300,7 @@ TEST_F(ShellProcessor, Far175)
 		{Function::CreateA,
 			nullptr, R"(""C:\1 @\a.cmd"")",
 			nullptr,
-			R"("%ConEmuBaseDirTest%\)" WIN3264TEST("ConEmuC.exe", "ConEmuC64.exe") R"(" %ConEmuLogTest%/PARENTFARPID=%ConEmuTestPid% /C ""C:\1 @\a.cmd"")"},
+			R"("%ConEmuBaseDirTest%\)" "ConEmuC.exe" R"(" %ConEmuLogTest%/PARENTFARPID=%ConEmuTestPid% /C ""C:\1 @\a.cmd"")"},
 		{Function::CreateA,
 			nullptr, R"(C:\Windows\system32\cmd.exe /K ""C:\1 @\a.cmd"")",
 			nullptr,

diff --git a/src/common/ConEmuCheck.cpp b/src/common/ConEmuCheck.cpp
@@ -508,6 +508,8 @@ BOOL LoadSrvMapping(HWND hConWnd, CESERVER_CONSOLE_MAPPING_HDR& SrvMapping)
 	const CESERVER_CONSOLE_MAPPING_HDR* pInfo = SrvInfoMapping.Open();
 	if (!pInfo || pInfo->nProtocolVersion != CESERVER_REQ_VER)
 	{
+		_ASSERTEX(pInfo != nullptr);
+		_ASSERTEX(pInfo != nullptr && pInfo->nProtocolVersion == CESERVER_REQ_VER);
 		return false;
 	}