DllMain test improved

Author: KindDragon

src/runtests.bat

@@ -27,10 +27,9 @@ ECHO [ RUNNING  ] %tests_path%\vld_unload.exe
 ECHO -------------------------------------------------------------------------------
 !tests_path!\vld_unload.exe --gtest_output="xml:!tests_path!\vld_unload.exe.xml"
 ECHO -------------------------------------------------------------------------------
-ECHO [ RUNNING  ] %tests_path%\vld_main.exe
+ECHO [ RUNNING  ] %tests_path%\vld_main_test.exe
 ECHO -------------------------------------------------------------------------------
-!tests_path!\vld_main.exe
-if %errorlevel% neq 0 exit /b %errorlevel%
+!tests_path!\vld_main_test.exe --gtest_output="xml:!tests_path!\vld_main_test.exe.xml"
 ECHO -------------------------------------------------------------------------------
 EXIT /b 0
 

src/tests/vld_main/vld_main.cpp

@@ -37,7 +37,7 @@ int _tmain(int argc, _TCHAR* argv[])
     // _tmain exits but before VLDReportLeaks() is called internally by VLD and
     // therefore correctly report 8 leaks.
     // VLDReportLeaks(); // at this point should report 9 leaks;
-    return VLDGetLeaksCount() == 9 ? 0 : -1;
+    return VLDGetLeaksCount();
 }
 
 
@@ -54,5 +54,5 @@ int WINAPI _tWinMain(__in HINSTANCE hInstance,
     // _tWinMain exits but before VLDReportLeaks() is called internally by VLD and
     // therefore correctly report 8 leaks.
     // VLDReportLeaks(); // at this point should report 9 leaks;
-    return VLDGetLeaksCount() == 9 ? 0 : -1;
+    return VLDGetLeaksCount();
 }

src/tests/vld_main_test/stdafx.cpp

@@ -0,0 +1,8 @@
+// stdafx.cpp : source file that includes just the standard includes
+// vld_main.pch will be the pre-compiled header
+// stdafx.obj will contain the pre-compiled type information
+
+#include "stdafx.h"
+
+// TODO: reference any additional headers you need in STDAFX.H
+// and not in this file

src/tests/vld_main_test/stdafx.h

@@ -0,0 +1,15 @@
+// stdafx.h : include file for standard system include files,
+// or project specific include files that are used frequently, but
+// are changed infrequently
+//
+
+#pragma once
+
+#include "targetver.h"
+
+#include <stdio.h>
+#include <tchar.h>
+
+
+
+// TODO: reference additional headers your program requires here

src/tests/vld_main_test/targetver.h

@@ -0,0 +1,8 @@
+#pragma once
+
+// Including SDKDDKVer.h defines the highest available Windows platform.
+
+// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and
+// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h.
+
+#include <SDKDDKVer.h>

src/tests/vld_main_test/vld_main_test.cpp

@@ -0,0 +1,46 @@
+// vld_main.cpp : Defines the entry point for the console application.
+//
+
+#include "stdafx.h"
+#include <Windows.h>
+#include <gtest/gtest.h>
+#include <string>
+
+std::wstring dir;
+
+TEST(TestWinMain, RunExe)
+{
+    PROCESS_INFORMATION processInformation = { 0 };
+    STARTUPINFO startupInfo = { 0 };
+    startupInfo.cb = sizeof(startupInfo);
+
+    std::wstring exe = dir + _T("vld_main.exe");
+
+    // Create the process
+    BOOL result = CreateProcess(exe.c_str(), NULL,
+        NULL, NULL, FALSE,
+        NORMAL_PRIORITY_CLASS | CREATE_NO_WINDOW,
+        NULL, NULL, &startupInfo, &processInformation);
+    EXPECT_NE(0, result);
+
+    // Successfully created the process.  Wait for it to finish.
+    EXPECT_EQ(WAIT_OBJECT_0, WaitForSingleObject(processInformation.hProcess, INFINITE));
+
+    // Get the exit code.
+    DWORD exitCode = 0;
+    result = GetExitCodeProcess(processInformation.hProcess, &exitCode);
+    EXPECT_NE(0, result);
+
+    // Close the handles.
+    CloseHandle(processInformation.hProcess);
+    CloseHandle(processInformation.hThread);
+    ASSERT_EQ(9, exitCode);
+}
+
+int _tmain(int argc, _TCHAR* argv[])
+{
+    dir = argv[0];
+    dir.resize(dir.find_last_of(_T("\\")) + 1);
+    ::testing::InitGoogleTest(&argc, argv);
+    return RUN_ALL_TESTS();
+}