[Mobies-commit] [commit] r3853 - in UDM/trunk: Projects/Win32/VC10/tests Projects/Win32/VC10/tests/test_staticleaks Projects/Win32/VC10/tests/test_staticleaksdll Projects/Win32/VC9/tests Projects/Win32/VC9/tests/test_staticleaksdll tests/test_staticleaksdll
ksmyth at redhat1.isis.vanderbilt.edu
ksmyth at redhat1.isis.vanderbilt.edu
Fri Aug 26 09:41:48 CDT 2011
Author: ksmyth
Date: Fri Aug 26 09:41:47 2011
New Revision: 3853
Log:
Add test
Added:
UDM/trunk/Projects/Win32/VC10/tests/test_staticleaks/
UDM/trunk/Projects/Win32/VC10/tests/test_staticleaks/test_staticleaks.vcxproj (contents, props changed)
UDM/trunk/Projects/Win32/VC10/tests/test_staticleaks/test_staticleaks.vcxproj.filters (contents, props changed)
UDM/trunk/Projects/Win32/VC10/tests/test_staticleaksdll/
UDM/trunk/Projects/Win32/VC10/tests/test_staticleaksdll/test_staticleaksdll.vcxproj (contents, props changed)
UDM/trunk/Projects/Win32/VC10/tests/test_staticleaksdll/test_staticleaksdll.vcxproj.filters (contents, props changed)
Modified:
UDM/trunk/Projects/Win32/VC10/tests/UdmTests.props
UDM/trunk/Projects/Win32/VC10/tests/UdmTests.sln
UDM/trunk/Projects/Win32/VC9/tests/UdmTests.sln
UDM/trunk/Projects/Win32/VC9/tests/test_staticleaksdll/test_staticleaksdll.vcproj
UDM/trunk/tests/test_staticleaksdll/DllMain.cpp
Modified: UDM/trunk/Projects/Win32/VC10/tests/UdmTests.props
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/UdmTests.props Fri Aug 26 09:18:22 2011 (r3852)
+++ UDM/trunk/Projects/Win32/VC10/tests/UdmTests.props Fri Aug 26 09:41:47 2011 (r3853)
@@ -14,6 +14,9 @@
<udm>
<AdditionalDependencies>$(UDM_EXE)</AdditionalDependencies>
</udm>
+ <Link>
+ <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ </Link>
</ItemDefinitionGroup>
<ItemGroup />
</Project>
\ No newline at end of file
Modified: UDM/trunk/Projects/Win32/VC10/tests/UdmTests.sln
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/UdmTests.sln Fri Aug 26 09:18:22 2011 (r3852)
+++ UDM/trunk/Projects/Win32/VC10/tests/UdmTests.sln Fri Aug 26 09:41:47 2011 (r3853)
@@ -28,6 +28,10 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CreateLampDiagram", "CreateLampDiagram\CreateLampDiagram.vcxproj", "{3FB0A5A6-8815-45A3-8D68-777C708410FB}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_staticleaks", "test_staticleaks\test_staticleaks.vcxproj", "{A4DE0E8A-C59B-4B1F-9A2A-775C547DFF39}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_staticleaksdll", "test_staticleaksdll\test_staticleaksdll.vcxproj", "{4F3BF916-A9BC-44BA-B867-BA14BE2EE074}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -90,6 +94,14 @@
{3FB0A5A6-8815-45A3-8D68-777C708410FB}.Debug|Win32.Build.0 = Debug|Win32
{3FB0A5A6-8815-45A3-8D68-777C708410FB}.Release|Win32.ActiveCfg = Release|Win32
{3FB0A5A6-8815-45A3-8D68-777C708410FB}.Release|Win32.Build.0 = Release|Win32
+ {A4DE0E8A-C59B-4B1F-9A2A-775C547DFF39}.Debug|Win32.ActiveCfg = Debug|Win32
+ {A4DE0E8A-C59B-4B1F-9A2A-775C547DFF39}.Debug|Win32.Build.0 = Debug|Win32
+ {A4DE0E8A-C59B-4B1F-9A2A-775C547DFF39}.Release|Win32.ActiveCfg = Debug|Win32
+ {A4DE0E8A-C59B-4B1F-9A2A-775C547DFF39}.Release|Win32.Build.0 = Debug|Win32
+ {4F3BF916-A9BC-44BA-B867-BA14BE2EE074}.Debug|Win32.ActiveCfg = Debug|Win32
+ {4F3BF916-A9BC-44BA-B867-BA14BE2EE074}.Debug|Win32.Build.0 = Debug|Win32
+ {4F3BF916-A9BC-44BA-B867-BA14BE2EE074}.Release|Win32.ActiveCfg = Debug|Win32
+ {4F3BF916-A9BC-44BA-B867-BA14BE2EE074}.Release|Win32.Build.0 = Debug|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Added: UDM/trunk/Projects/Win32/VC10/tests/test_staticleaks/test_staticleaks.vcxproj
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ UDM/trunk/Projects/Win32/VC10/tests/test_staticleaks/test_staticleaks.vcxproj Fri Aug 26 09:41:47 2011 (r3853)
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{A4DE0E8A-C59B-4B1F-9A2A-775C547DFF39}</ProjectGuid>
+ <RootNamespace>test_staticleaks</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="..\UdmTests.props" />
+ <Import Project="..\cppunit.props" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <CustomBuildStep>
+ <Message>Running $(ProjectName)</Message>
+ <Command>cd "$(OutDir)Gen\tests\test_refports"
+"$(TargetPath)"
+</Command>
+ <Outputs>NONE;%(Outputs)</Outputs>
+ </CustomBuildStep>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <WarningLevel>Level3</WarningLevel>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>cppunitd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <LargeAddressAware>true</LargeAddressAware>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\..\..\..\tests\test_staticleaks\main.cpp" />
+ <ClCompile Include="..\..\..\..\..\tests\test_staticleaks\test_staticleaks.cpp" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\test_staticleaksdll\test_staticleaksdll.vcxproj">
+ <Project>{4f3bf916-a9bc-44ba-b867-ba14be2ee074}</Project>
+ <Private>true</Private>
+ <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
+ <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
+ <LinkLibraryDependencies>false</LinkLibraryDependencies>
+ <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file
Added: UDM/trunk/Projects/Win32/VC10/tests/test_staticleaks/test_staticleaks.vcxproj.filters
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ UDM/trunk/Projects/Win32/VC10/tests/test_staticleaks/test_staticleaks.vcxproj.filters Fri Aug 26 09:41:47 2011 (r3853)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+ <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+ </Filter>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+ <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\..\..\..\tests\test_staticleaks\main.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\..\..\tests\test_staticleaks\test_staticleaks.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ </ItemGroup>
+</Project>
\ No newline at end of file
Added: UDM/trunk/Projects/Win32/VC10/tests/test_staticleaksdll/test_staticleaksdll.vcxproj
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ UDM/trunk/Projects/Win32/VC10/tests/test_staticleaksdll/test_staticleaksdll.vcxproj Fri Aug 26 09:41:47 2011 (r3853)
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{4F3BF916-A9BC-44BA-B867-BA14BE2EE074}</ProjectGuid>
+ <RootNamespace>test_staticleaksdll</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="..\UdmTests.props" />
+ <Import Project="..\cppunit.props" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <LargeAddressAware>true</LargeAddressAware>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\..\..\..\tests\test_staticleaksdll\DllMain.cpp" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\CreateLampDiagram\CreateLampDiagram.vcxproj">
+ <Project>{3fb0a5a6-8815-45a3-8d68-777c708410fb}</Project>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file
Added: UDM/trunk/Projects/Win32/VC10/tests/test_staticleaksdll/test_staticleaksdll.vcxproj.filters
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ UDM/trunk/Projects/Win32/VC10/tests/test_staticleaksdll/test_staticleaksdll.vcxproj.filters Fri Aug 26 09:41:47 2011 (r3853)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+ <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+ </Filter>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+ <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\..\..\..\tests\test_staticleaksdll\DllMain.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ </ItemGroup>
+</Project>
\ No newline at end of file
Modified: UDM/trunk/Projects/Win32/VC9/tests/UdmTests.sln
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/tests/UdmTests.sln Fri Aug 26 09:18:22 2011 (r3852)
+++ UDM/trunk/Projects/Win32/VC9/tests/UdmTests.sln Fri Aug 26 09:41:47 2011 (r3853)
@@ -74,7 +74,7 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_staticleaksdll", "test_staticleaksdll\test_staticleaksdll.vcproj", "{4F3BF916-A9BC-44BA-B867-BA14BE2EE074}"
ProjectSection(ProjectDependencies) = postProject
- {95B70B72-F65E-44F1-AF18-FCE1ED1B4FC7} = {95B70B72-F65E-44F1-AF18-FCE1ED1B4FC7}
+ {7B2D07A4-E108-45B1-860B-43084AAB9192} = {7B2D07A4-E108-45B1-860B-43084AAB9192}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_staticleaks", "test_staticleaks\test_staticleaks.vcproj", "{A4DE0E8A-C59B-4B1F-9A2A-775C547DFF39}"
@@ -173,7 +173,7 @@
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
- {7B2D07A4-E108-45B1-860B-43084AAB9192} = {A2F36369-A019-4B5E-AD5B-3A5AA425069C}
{4CA139A6-D338-4C6D-B9AD-86B65B8E5129} = {A2F36369-A019-4B5E-AD5B-3A5AA425069C}
+ {7B2D07A4-E108-45B1-860B-43084AAB9192} = {A2F36369-A019-4B5E-AD5B-3A5AA425069C}
EndGlobalSection
EndGlobal
Modified: UDM/trunk/Projects/Win32/VC9/tests/test_staticleaksdll/test_staticleaksdll.vcproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/tests/test_staticleaksdll/test_staticleaksdll.vcproj Fri Aug 26 09:18:22 2011 (r3852)
+++ UDM/trunk/Projects/Win32/VC9/tests/test_staticleaksdll/test_staticleaksdll.vcproj Fri Aug 26 09:41:47 2011 (r3853)
@@ -39,6 +39,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\..\..\include;$(OutDir)\Gen\samples"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -97,7 +98,7 @@
>
</File>
<File
- RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_refports\RefPort.cpp"
+ RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\samples\LampDiagram.cpp"
>
</File>
</Filter>
Modified: UDM/trunk/tests/test_staticleaksdll/DllMain.cpp
==============================================================================
--- UDM/trunk/tests/test_staticleaksdll/DllMain.cpp Fri Aug 26 09:18:22 2011 (r3852)
+++ UDM/trunk/tests/test_staticleaksdll/DllMain.cpp Fri Aug 26 09:41:47 2011 (r3853)
@@ -2,7 +2,8 @@
#include <stdlib.h>
#include <crtdbg.h>
-#include "../test_refports/RefPort.h"
+//#include "../test_refports/RefPort.h"
+#include "LampDiagram.h"
#include "UdmBase.h"
#include "UdmStatic.h"
@@ -12,6 +13,7 @@
_CrtMemState* state = (_CrtMemState*) data;
Uml::Initialize();
- RefPort::Initialize();
+ //RefPort::Initialize();
+ LampDiagram::Initialize();
UdmUtil::stacktrace();
}
\ No newline at end of file
More information about the Mobies-commit
mailing list