Skip to content

Commit ddd3b0e

Browse files
stgatesunknown
authored andcommitted
Finished adding support for running memory leak detection on the tests.
Also fixed up a couple of the json vcxproj files that were messing up the additional libraries directory.
1 parent 98da227 commit ddd3b0e

File tree

5 files changed

+9
-7
lines changed

5 files changed

+9
-7
lines changed

Release/src/utilities/asyncrt_utils.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ using namespace boost::locale::conv;
4343
// For more details see https://casablanca.codeplex.com/wikipage?title=Running%20Leak%20Detection&IsNewlyCreatedPage=true
4444
#if defined(CASA_ENABLE_VLD)
4545
#include "C:/Program Files (x86)/Visual Leak Detector/include/vld.h"
46-
#pragma comment(lib, "vld.lib")
4746
#endif
4847

4948
using namespace web;

Release/tests/Common/UnitTestpp/unittestpp.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,9 @@
4444
// For more details see https://casablanca.codeplex.com/wikipage?title=Running%20Leak%20Detection&IsNewlyCreatedPage=true
4545
#if defined(CASA_ENABLE_VLD)
4646
#include "C:/Program Files (x86)/Visual Leak Detector/include/vld.h"
47-
#pragma comment(lib, "vld.lib")
47+
48+
// vld.h pulls in Windows.h
49+
#undef max
50+
#undef min
51+
4852
#endif

Release/tests/Common/utilities/stdafx.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,4 @@
3838
// For more details see https://casablanca.codeplex.com/wikipage?title=Running%20Leak%20Detection&IsNewlyCreatedPage=true
3939
#if defined(CASA_ENABLE_VLD)
4040
#include "C:/Program Files (x86)/Visual Leak Detector/include/vld.h"
41-
#pragma comment(lib, "vld.lib")
4241
#endif

Release/tests/Functional/json/VS11.xp/JSON110_test.xp.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
<Link>
8888
<SubSystem>Console</SubSystem>
8989
<GenerateDebugInformation>true</GenerateDebugInformation>
90-
<AdditionalLibraryDirectories>$(OutDir)%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
90+
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
9191
</Link>
9292
</ItemDefinitionGroup>
9393
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
@@ -100,7 +100,7 @@
100100
<Link>
101101
<SubSystem>Console</SubSystem>
102102
<GenerateDebugInformation>true</GenerateDebugInformation>
103-
<AdditionalLibraryDirectories>$(OutDir)%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
103+
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
104104
</Link>
105105
</ItemDefinitionGroup>
106106
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

Release/tests/Functional/json/VS11/JSON110_test.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
<Link>
8888
<SubSystem>Console</SubSystem>
8989
<GenerateDebugInformation>true</GenerateDebugInformation>
90-
<AdditionalLibraryDirectories>$(OutDir)%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
90+
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
9191
</Link>
9292
</ItemDefinitionGroup>
9393
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
@@ -100,7 +100,7 @@
100100
<Link>
101101
<SubSystem>Console</SubSystem>
102102
<GenerateDebugInformation>true</GenerateDebugInformation>
103-
<AdditionalLibraryDirectories>$(OutDir)%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
103+
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
104104
</Link>
105105
</ItemDefinitionGroup>
106106
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

0 commit comments

Comments
 (0)