Skip to content

Commit d628c2c

Browse files
sdottakasdottaka
committed
UnitTests: Reduce build time
1 parent ad90a4e commit d628c2c

File tree

5 files changed

+44
-22
lines changed

5 files changed

+44
-22
lines changed

‎Src/DiffList.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -838,7 +838,7 @@ void DiffList::GetExtraLinesCounts(int nFiles, int extras[3])
838838
for (file = 0; file < nFiles; file++)
839839
{
840840
nline[file] = curDiff.end[file]-curDiff.begin[file]+1;
841-
nmaxline = std::max(nmaxline, nline[file]);
841+
nmaxline = (std::max)(nmaxline, nline[file]);
842842
}
843843
for (file = 0; file < nFiles; file++)
844844
extras[file] += nmaxline - nline[file];

‎Testing/GoogleTest/UnitTests/UnitTests.vcxproj

+13-15
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@
195195
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
196196
<ClCompile>
197197
<Optimization>Disabled</Optimization>
198-
<AdditionalIncludeDirectories>..\..\..\Src;..\..\..\Src\Common;..\..\..\Externals\crystaledit\editlib;..\..\..\Externals\boost;..\..\..\Externals\poco\Foundation\include;..\..\..\Externals\poco\XML\include;..\..\..\Externals\googletest\googletest\include;..\..\..\Externals\googletest\googletest;..\..\..\Src\diffutils\src;..\..\..\Src\diffutils\lib;..\..\..\Src\diffutils\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
198+
<AdditionalIncludeDirectories>.;..\..\..\Src;..\..\..\Src\Common;..\..\..\Externals\crystaledit\editlib;..\..\..\Externals\boost;..\..\..\Externals\poco\Foundation\include;..\..\..\Externals\poco\XML\include;..\..\..\Externals\googletest\googletest\include;..\..\..\Externals\googletest\googletest;..\..\..\Src\diffutils\src;..\..\..\Src\diffutils\lib;..\..\..\Src\diffutils\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
199199
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;UNICODE;POCO_STATIC;_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS;GTEST_HAS_TR1_TUPLE=0;EDITPADC_CLASS=;%(PreprocessorDefinitions)</PreprocessorDefinitions>
200200
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
201201
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -225,7 +225,7 @@
225225
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
226226
<ClCompile>
227227
<Optimization>Disabled</Optimization>
228-
<AdditionalIncludeDirectories>..\..\..\Src;..\..\..\Src\Common;..\..\..\Externals\crystaledit\editlib;..\..\..\Externals\boost;..\..\..\Externals\poco\Foundation\include;..\..\..\Externals\poco\XML\include;..\..\..\Externals\googletest\googletest\include;..\..\..\Externals\googletest\googletest;..\..\..\Src\diffutils\src;..\..\..\Src\diffutils\lib;..\..\..\Src\diffutils\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
228+
<AdditionalIncludeDirectories>.;..\..\..\Src;..\..\..\Src\Common;..\..\..\Externals\crystaledit\editlib;..\..\..\Externals\boost;..\..\..\Externals\poco\Foundation\include;..\..\..\Externals\poco\XML\include;..\..\..\Externals\googletest\googletest\include;..\..\..\Externals\googletest\googletest;..\..\..\Src\diffutils\src;..\..\..\Src\diffutils\lib;..\..\..\Src\diffutils\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
229229
<PreprocessorDefinitions>WIN32;WIN64;_DEBUG;_CONSOLE;UNICODE;POCO_STATIC;_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS;GTEST_HAS_TR1_TUPLE=0;EDITPADC_CLASS=;%(PreprocessorDefinitions)</PreprocessorDefinitions>
230230
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
231231
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -253,7 +253,7 @@
253253
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
254254
<ClCompile>
255255
<Optimization>Disabled</Optimization>
256-
<AdditionalIncludeDirectories>..\..\..\Src;..\..\..\Src\Common;..\..\..\Externals\crystaledit\editlib;..\..\..\Externals\boost;..\..\..\Externals\poco\Foundation\include;..\..\..\Externals\poco\XML\include;..\..\..\Externals\googletest\googletest\include;..\..\..\Externals\googletest\googletest;..\..\..\Src\diffutils\src;..\..\..\Src\diffutils\lib;..\..\..\Src\diffutils\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
256+
<AdditionalIncludeDirectories>.;..\..\..\Src;..\..\..\Src\Common;..\..\..\Externals\crystaledit\editlib;..\..\..\Externals\boost;..\..\..\Externals\poco\Foundation\include;..\..\..\Externals\poco\XML\include;..\..\..\Externals\googletest\googletest\include;..\..\..\Externals\googletest\googletest;..\..\..\Src\diffutils\src;..\..\..\Src\diffutils\lib;..\..\..\Src\diffutils\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
257257
<PreprocessorDefinitions>WIN32;WIN64;_DEBUG;_CONSOLE;UNICODE;POCO_STATIC;_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS;GTEST_HAS_TR1_TUPLE=0;EDITPADC_CLASS=;%(PreprocessorDefinitions)</PreprocessorDefinitions>
258258
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
259259
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -281,7 +281,7 @@
281281
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
282282
<ClCompile>
283283
<Optimization>Disabled</Optimization>
284-
<AdditionalIncludeDirectories>..\..\..\Src;..\..\..\Src\Common;..\..\..\Externals\crystaledit\editlib;..\..\..\Externals\boost;..\..\..\Externals\poco\Foundation\include;..\..\..\Externals\poco\XML\include;..\..\..\Externals\googletest\googletest\include;..\..\..\Externals\googletest\googletest;..\..\..\Src\diffutils\src;..\..\..\Src\diffutils\lib;..\..\..\Src\diffutils\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
284+
<AdditionalIncludeDirectories>.;..\..\..\Src;..\..\..\Src\Common;..\..\..\Externals\crystaledit\editlib;..\..\..\Externals\boost;..\..\..\Externals\poco\Foundation\include;..\..\..\Externals\poco\XML\include;..\..\..\Externals\googletest\googletest\include;..\..\..\Externals\googletest\googletest;..\..\..\Src\diffutils\src;..\..\..\Src\diffutils\lib;..\..\..\Src\diffutils\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
285285
<PreprocessorDefinitions>WIN32;WIN64;_DEBUG;_CONSOLE;UNICODE;POCO_STATIC;_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS;GTEST_HAS_TR1_TUPLE=0;EDITPADC_CLASS=;%(PreprocessorDefinitions)</PreprocessorDefinitions>
286286
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
287287
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -308,7 +308,7 @@
308308
</ItemDefinitionGroup>
309309
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
310310
<ClCompile>
311-
<AdditionalIncludeDirectories>..\..\..\Src;..\..\..\Src\Common;..\..\..\Externals\crystaledit\editlib;..\..\..\Externals\boost;..\..\..\Externals\poco\Foundation\include;..\..\..\Externals\poco\XML\include;..\..\..\Externals\googletest\googletest\include;..\..\..\Externals\googletest\googletest;..\..\..\Src\diffutils\src;..\..\..\Src\diffutils\lib;..\..\..\Src\diffutils\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
311+
<AdditionalIncludeDirectories>.;..\..\..\Src;..\..\..\Src\Common;..\..\..\Externals\crystaledit\editlib;..\..\..\Externals\boost;..\..\..\Externals\poco\Foundation\include;..\..\..\Externals\poco\XML\include;..\..\..\Externals\googletest\googletest\include;..\..\..\Externals\googletest\googletest;..\..\..\Src\diffutils\src;..\..\..\Src\diffutils\lib;..\..\..\Src\diffutils\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
312312
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;UNICODE;POCO_STATIC;_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS;GTEST_HAS_TR1_TUPLE=0;EDITPADC_CLASS=;%(PreprocessorDefinitions)</PreprocessorDefinitions>
313313
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
314314
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
@@ -337,7 +337,7 @@
337337
</ItemDefinitionGroup>
338338
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
339339
<ClCompile>
340-
<AdditionalIncludeDirectories>..\..\..\Src;..\..\..\Src\Common;..\..\..\Externals\crystaledit\editlib;..\..\..\Externals\boost;..\..\..\Externals\poco\Foundation\include;..\..\..\Externals\poco\XML\include;..\..\..\Externals\googletest\googletest\include;..\..\..\Externals\googletest\googletest;..\..\..\Src\diffutils\src;..\..\..\Src\diffutils\lib;..\..\..\Src\diffutils\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
340+
<AdditionalIncludeDirectories>.;..\..\..\Src;..\..\..\Src\Common;..\..\..\Externals\crystaledit\editlib;..\..\..\Externals\boost;..\..\..\Externals\poco\Foundation\include;..\..\..\Externals\poco\XML\include;..\..\..\Externals\googletest\googletest\include;..\..\..\Externals\googletest\googletest;..\..\..\Src\diffutils\src;..\..\..\Src\diffutils\lib;..\..\..\Src\diffutils\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
341341
<PreprocessorDefinitions>WIN32;WIN64;NDEBUG;_CONSOLE;UNICODE;POCO_STATIC;_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS;GTEST_HAS_TR1_TUPLE=0;EDITPADC_CLASS=;%(PreprocessorDefinitions)</PreprocessorDefinitions>
342342
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
343343
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
@@ -364,7 +364,7 @@
364364
</ItemDefinitionGroup>
365365
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
366366
<ClCompile>
367-
<AdditionalIncludeDirectories>..\..\..\Src;..\..\..\Src\Common;..\..\..\Externals\crystaledit\editlib;..\..\..\Externals\boost;..\..\..\Externals\poco\Foundation\include;..\..\..\Externals\poco\XML\include;..\..\..\Externals\googletest\googletest\include;..\..\..\Externals\googletest\googletest;..\..\..\Src\diffutils\src;..\..\..\Src\diffutils\lib;..\..\..\Src\diffutils\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
367+
<AdditionalIncludeDirectories>.;..\..\..\Src;..\..\..\Src\Common;..\..\..\Externals\crystaledit\editlib;..\..\..\Externals\boost;..\..\..\Externals\poco\Foundation\include;..\..\..\Externals\poco\XML\include;..\..\..\Externals\googletest\googletest\include;..\..\..\Externals\googletest\googletest;..\..\..\Src\diffutils\src;..\..\..\Src\diffutils\lib;..\..\..\Src\diffutils\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
368368
<PreprocessorDefinitions>WIN32;WIN64;NDEBUG;_CONSOLE;UNICODE;POCO_STATIC;_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS;GTEST_HAS_TR1_TUPLE=0;EDITPADC_CLASS=;%(PreprocessorDefinitions)</PreprocessorDefinitions>
369369
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
370370
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
@@ -391,7 +391,7 @@
391391
</ItemDefinitionGroup>
392392
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
393393
<ClCompile>
394-
<AdditionalIncludeDirectories>..\..\..\Src;..\..\..\Src\Common;..\..\..\Externals\crystaledit\editlib;..\..\..\Externals\boost;..\..\..\Externals\poco\Foundation\include;..\..\..\Externals\poco\XML\include;..\..\..\Externals\googletest\googletest\include;..\..\..\Externals\googletest\googletest;..\..\..\Src\diffutils\src;..\..\..\Src\diffutils\lib;..\..\..\Src\diffutils\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
394+
<AdditionalIncludeDirectories>.;..\..\..\Src;..\..\..\Src\Common;..\..\..\Externals\crystaledit\editlib;..\..\..\Externals\boost;..\..\..\Externals\poco\Foundation\include;..\..\..\Externals\poco\XML\include;..\..\..\Externals\googletest\googletest\include;..\..\..\Externals\googletest\googletest;..\..\..\Src\diffutils\src;..\..\..\Src\diffutils\lib;..\..\..\Src\diffutils\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
395395
<PreprocessorDefinitions>WIN32;WIN64;NDEBUG;_CONSOLE;UNICODE;POCO_STATIC;_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS;GTEST_HAS_TR1_TUPLE=0;EDITPADC_CLASS=;%(PreprocessorDefinitions)</PreprocessorDefinitions>
396396
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
397397
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
@@ -557,11 +557,6 @@
557557
<ClCompile Include="..\..\..\Src\PatchHTML.cpp">
558558
<PrecompiledHeader>Use</PrecompiledHeader>
559559
</ClCompile>
560-
<ClCompile Include="..\..\..\Src\pch.cpp">
561-
<PrecompiledHeader>Create</PrecompiledHeader>
562-
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
563-
<PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
564-
</ClCompile>
565560
<ClCompile Include="..\..\..\Src\HashCalc.cpp">
566561
<PrecompiledHeader>Use</PrecompiledHeader>
567562
</ClCompile>
@@ -816,6 +811,9 @@
816811
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
817812
<PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
818813
</ClCompile>
814+
<ClCompile Include="pch.cpp">
815+
<PrecompiledHeader>Create</PrecompiledHeader>
816+
</ClCompile>
819817
<ClCompile Include="test_main.cpp">
820818
<PrecompiledHeader>Use</PrecompiledHeader>
821819
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
@@ -872,7 +870,6 @@
872870
<ClInclude Include="..\..\..\Src\PatchHTML.h" />
873871
<ClInclude Include="..\..\..\Src\PathContext.h" />
874872
<ClInclude Include="..\..\..\Src\paths.h" />
875-
<ClInclude Include="..\..\..\Src\pch.h" />
876873
<ClInclude Include="..\..\..\Src\PluginManager.h" />
877874
<ClInclude Include="..\..\..\Src\Plugins.h" />
878875
<ClInclude Include="..\..\..\Src\ProjectFile.h" />
@@ -889,8 +886,9 @@
889886
<ClInclude Include="..\..\..\Src\SubstitutionList.h" />
890887
<ClInclude Include="..\..\..\Src\TempFile.h" />
891888
<ClInclude Include="..\..\..\Src\xdiff_gnudiff_compat.h" />
889+
<ClInclude Include="pch.h" />
892890
</ItemGroup>
893891
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
894892
<ImportGroup Label="ExtensionTargets">
895893
</ImportGroup>
896-
</Project>
894+
</Project>

‎Testing/GoogleTest/UnitTests/UnitTests.vcxproj.filters

+6-6
Original file line numberDiff line numberDiff line change
@@ -216,9 +216,6 @@
216216
<ClCompile Include="..\diffutils\mystat_test.cpp">
217217
<Filter>Tests</Filter>
218218
</ClCompile>
219-
<ClCompile Include="..\..\..\Src\pch.cpp">
220-
<Filter>Source Files</Filter>
221-
</ClCompile>
222219
<ClCompile Include="..\..\..\Src\DirTravel.cpp">
223220
<Filter>Source Files</Filter>
224221
</ClCompile>
@@ -297,6 +294,9 @@
297294
<ClCompile Include="..\..\..\Src\SubstitutionFiltersList.cpp">
298295
<Filter>Source Files</Filter>
299296
</ClCompile>
297+
<ClCompile Include="pch.cpp">
298+
<Filter>Source Files</Filter>
299+
</ClCompile>
300300
</ItemGroup>
301301
<ItemGroup>
302302
<ClInclude Include="..\..\..\Src\charsets.h">
@@ -401,9 +401,6 @@
401401
<ClInclude Include="..\..\..\Src\DiffItem.h">
402402
<Filter>Header Files</Filter>
403403
</ClInclude>
404-
<ClInclude Include="..\..\..\Src\pch.h">
405-
<Filter>Header Files</Filter>
406-
</ClInclude>
407404
<ClInclude Include="..\..\..\Src\DirTravel.h">
408405
<Filter>Header Files</Filter>
409406
</ClInclude>
@@ -452,5 +449,8 @@
452449
<ClInclude Include="..\..\..\Src\PatchHTML.h">
453450
<Filter>Header Files</Filter>
454451
</ClInclude>
452+
<ClInclude Include="pch.h">
453+
<Filter>Header Files</Filter>
454+
</ClInclude>
455455
</ItemGroup>
456456
</Project>

‎Testing/GoogleTest/UnitTests/pch.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "pch.h"

‎Testing/GoogleTest/UnitTests/pch.h

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
#pragma once
2+
3+
#include <string>
4+
#include <vector>
5+
#include <map>
6+
#include <unordered_set>
7+
#include <stack>
8+
#include <list>
9+
#include <array>
10+
#include <algorithm>
11+
#include <iostream>
12+
#include <sstream>
13+
#include <memory>
14+
#include <functional>
15+
#include <cassert>
16+
#include <ctime>
17+
#include <cctype>
18+
#include <boost/flyweight.hpp>
19+
#include <gtest/gtest.h>
20+
#include <gtest/gtest-param-test.h>
21+
#include <Windows.h>
22+
#include <shlobj.h>
23+
#include <shlwapi.h>

0 commit comments

Comments
 (0)