diff --git a/elenasrc3/elena-tests/elena-tests.vcxproj b/elenasrc3/elena-tests/elena-tests.vcxproj new file mode 100644 index 000000000..c763f507e --- /dev/null +++ b/elenasrc3/elena-tests/elena-tests.vcxproj @@ -0,0 +1,148 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + {89a68a7e-1cb6-45cb-9b02-8183ff59284a} + Win32Proj + 10.0.22621.0 + Application + v143 + Unicode + + + + + + + + + ..\..\bin\ + ..\temp\elena-tests\ + elena-tests + + + ..\..\bin\ + elena-tests64 + ..\temp\elena-tests64\ + + + ..\..\bin\ + ..\temp\elena-tests\ + elena-tests + + + elena-tests64 + ..\..\bin\ + ..\temp\elena-tests64\ + + + + + Use + pch.h + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + Level3 + + + true + Console + + + + + Use + pch.h + Disabled + X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + Level3 + + + true + Console + + + + + Use + pch.h + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDLL + Level3 + ProgramDatabase + + + true + Console + true + true + + + + + Use + pch.h + X64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDLL + Level3 + ProgramDatabase + + + true + Console + true + true + + + + + + + + + Create + Create + Create + Create + + + + + {85bbe576-02a3-414e-bf88-35280fafadad} + + + + + + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + \ No newline at end of file diff --git a/elenasrc3/elena-tests/packages.config b/elenasrc3/elena-tests/packages.config new file mode 100644 index 000000000..be1fa037f --- /dev/null +++ b/elenasrc3/elena-tests/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/elenasrc3/elena-tests/pch.cpp b/elenasrc3/elena-tests/pch.cpp new file mode 100644 index 000000000..250fb2778 --- /dev/null +++ b/elenasrc3/elena-tests/pch.cpp @@ -0,0 +1,5 @@ +// +// pch.cpp +// + +#include "pch.h" diff --git a/elenasrc3/elena-tests/pch.h b/elenasrc3/elena-tests/pch.h new file mode 100644 index 000000000..0572a70b0 --- /dev/null +++ b/elenasrc3/elena-tests/pch.h @@ -0,0 +1,7 @@ +// +// pch.h +// + +#pragma once + +#include "gtest/gtest.h" diff --git a/elenasrc3/elena-tests/test.cpp b/elenasrc3/elena-tests/test.cpp new file mode 100644 index 000000000..e238589d2 --- /dev/null +++ b/elenasrc3/elena-tests/test.cpp @@ -0,0 +1,6 @@ +#include "pch.h" + +TEST(TestCaseName, TestName) { + EXPECT_EQ(1, 1); + EXPECT_TRUE(true); +} \ No newline at end of file diff --git a/elenasrc3/elenasrc3.sln b/elenasrc3/elenasrc3.sln index 2c1fc62b9..3832e939c 100644 --- a/elenasrc3/elenasrc3.sln +++ b/elenasrc3/elenasrc3.sln @@ -32,7 +32,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "elt", "tools\elt\vs\elt.vcx {E2686A7D-1888-4078-B5F3-63FD4F2682A4} = {E2686A7D-1888-4078-B5F3-63FD4F2682A4} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "elena-testset", "elena-testset\vs\elena-testset.vcxproj", "{D2133413-B7C6-484A-AC50-44369C0BAE25}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "elena-tests", "elena-tests\elena-tests.vcxproj", "{89A68A7E-1CB6-45CB-9B02-8183FF59284A}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -130,14 +130,14 @@ Global {BDA77ED4-5133-45DC-9E2A-EF1077600A27}.Release|x64.Build.0 = Release|x64 {BDA77ED4-5133-45DC-9E2A-EF1077600A27}.Release|x86.ActiveCfg = Release|Win32 {BDA77ED4-5133-45DC-9E2A-EF1077600A27}.Release|x86.Build.0 = Release|Win32 - {D2133413-B7C6-484A-AC50-44369C0BAE25}.Debug|x64.ActiveCfg = Debug|x64 - {D2133413-B7C6-484A-AC50-44369C0BAE25}.Debug|x64.Build.0 = Debug|x64 - {D2133413-B7C6-484A-AC50-44369C0BAE25}.Debug|x86.ActiveCfg = Debug|Win32 - {D2133413-B7C6-484A-AC50-44369C0BAE25}.Debug|x86.Build.0 = Debug|Win32 - {D2133413-B7C6-484A-AC50-44369C0BAE25}.Release|x64.ActiveCfg = Release|x64 - {D2133413-B7C6-484A-AC50-44369C0BAE25}.Release|x64.Build.0 = Release|x64 - {D2133413-B7C6-484A-AC50-44369C0BAE25}.Release|x86.ActiveCfg = Release|Win32 - {D2133413-B7C6-484A-AC50-44369C0BAE25}.Release|x86.Build.0 = Release|Win32 + {89A68A7E-1CB6-45CB-9B02-8183FF59284A}.Debug|x64.ActiveCfg = Debug|x64 + {89A68A7E-1CB6-45CB-9B02-8183FF59284A}.Debug|x64.Build.0 = Debug|x64 + {89A68A7E-1CB6-45CB-9B02-8183FF59284A}.Debug|x86.ActiveCfg = Debug|Win32 + {89A68A7E-1CB6-45CB-9B02-8183FF59284A}.Debug|x86.Build.0 = Debug|Win32 + {89A68A7E-1CB6-45CB-9B02-8183FF59284A}.Release|x64.ActiveCfg = Release|x64 + {89A68A7E-1CB6-45CB-9B02-8183FF59284A}.Release|x64.Build.0 = Release|x64 + {89A68A7E-1CB6-45CB-9B02-8183FF59284A}.Release|x86.ActiveCfg = Release|Win32 + {89A68A7E-1CB6-45CB-9B02-8183FF59284A}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/recompile60.bat b/recompile60.bat index 61eb396ee..b25d25a75 100644 --- a/recompile60.bat +++ b/recompile60.bat @@ -17,6 +17,9 @@ REM /m:2 is used to build using parallel compilation "%InstallDir%\MSBuild\Current\Bin\MSBuild.exe" elenasrc3\elenasrc3.sln /p:configuration=release /p:Platform="x86" /m:2 IF NOT %ERRORLEVEL%==0 GOTO CompilerError +bin\elena-tests.exe +IF NOT %ERRORLEVEL%==0 GOTO CompilerError + REM /m:2 is used to build using parallel compilation "%InstallDir%\MSBuild\Current\Bin\MSBuild.exe" elenasrc3\elenasrc3.sln /p:configuration=release /p:Platform="x64" /m:2 IF NOT %ERRORLEVEL%==0 GOTO CompilerError