[Mobies-commit] [commit] r3843 - in UDM/trunk/Projects/Win32/VC10/tests: . test_childrenorder test_generic test_generic2 test_libs test_ns test_ns2 test_simpleudmops
ksmyth at redhat1.isis.vanderbilt.edu
ksmyth at redhat1.isis.vanderbilt.edu
Thu Aug 25 14:38:42 CDT 2011
Author: ksmyth
Date: Thu Aug 25 14:38:42 2011
New Revision: 3843
Log:
Fix some tests
Modified:
UDM/trunk/Projects/Win32/VC10/tests/UdmTests.props
UDM/trunk/Projects/Win32/VC10/tests/test_childrenorder/test_childrenorder.vcxproj
UDM/trunk/Projects/Win32/VC10/tests/test_generic/test_generic.vcxproj
UDM/trunk/Projects/Win32/VC10/tests/test_generic2/test_generic2.vcxproj
UDM/trunk/Projects/Win32/VC10/tests/test_libs/test_libs.vcxproj
UDM/trunk/Projects/Win32/VC10/tests/test_ns/test_ns.vcxproj
UDM/trunk/Projects/Win32/VC10/tests/test_ns2/test_ns2.vcxproj
UDM/trunk/Projects/Win32/VC10/tests/test_simpleudmops/LampTest.vcxproj
Modified: UDM/trunk/Projects/Win32/VC10/tests/UdmTests.props
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/UdmTests.props Thu Aug 25 14:11:18 2011 (r3842)
+++ UDM/trunk/Projects/Win32/VC10/tests/UdmTests.props Thu Aug 25 14:38:42 2011 (r3843)
@@ -10,6 +10,9 @@
<AdditionalIncludeDirectories>..\..\..\..\..\samples\CreateLampModel;$(UDM_PATH)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>UDM_DYNAMIC_LINKING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
+ <udm>
+ <AdditionalDependencies>$(UDM_EXE)</AdditionalDependencies>
+ </udm>
</ItemDefinitionGroup>
<ItemGroup />
</Project>
\ No newline at end of file
Modified: UDM/trunk/Projects/Win32/VC10/tests/test_childrenorder/test_childrenorder.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/test_childrenorder/test_childrenorder.vcxproj Thu Aug 25 14:11:18 2011 (r3842)
+++ UDM/trunk/Projects/Win32/VC10/tests/test_childrenorder/test_childrenorder.vcxproj Thu Aug 25 14:38:42 2011 (r3843)
@@ -91,9 +91,15 @@
<TargetMachine>MachineX86</TargetMachine>
</Link>
<PostBuildEvent>
+ <Command>
+ </Command>
+ </PostBuildEvent>
+ <CustomBuildStep>
<Command>cd "$(OutDir)Gen\samples"
"$(TargetPath)"</Command>
- </PostBuildEvent>
+ <Message>Running $(TargetName)</Message>
+ <Outputs>None</Outputs>
+ </CustomBuildStep>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Midl>
@@ -139,9 +145,15 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
<PostBuildEvent>
+ <Command>
+ </Command>
+ </PostBuildEvent>
+ <CustomBuildStep>
<Command>cd "$(OutDir)Gen\samples"
"$(TargetPath)"</Command>
- </PostBuildEvent>
+ <Message>Running $(TargetName)</Message>
+ <Outputs>None</Outputs>
+ </CustomBuildStep>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\..\tests\test_childrenorder\childrenorderTest.cpp">
Modified: UDM/trunk/Projects/Win32/VC10/tests/test_generic/test_generic.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/test_generic/test_generic.vcxproj Thu Aug 25 14:11:18 2011 (r3842)
+++ UDM/trunk/Projects/Win32/VC10/tests/test_generic/test_generic.vcxproj Thu Aug 25 14:38:42 2011 (r3843)
@@ -93,10 +93,20 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
<PostBuildEvent>
+ <Command>
+ </Command>
+ </PostBuildEvent>
+ <CustomBuildStep>
<Command>cd "$(OutDir)Gen\samples"
"$(TargetPath)"
</Command>
- </PostBuildEvent>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Message>Running $(TargetName)</Message>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Outputs>NONE</Outputs>
+ </CustomBuildStep>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Midl>
@@ -140,10 +150,20 @@
<TargetMachine>MachineX86</TargetMachine>
</Link>
<PostBuildEvent>
+ <Command>
+ </Command>
+ </PostBuildEvent>
+ <CustomBuildStep>
<Command>cd "$(OutDir)Gen\samples"
"$(TargetPath)"
</Command>
- </PostBuildEvent>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Message>Running $(TargetName)</Message>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Outputs>NONE</Outputs>
+ </CustomBuildStep>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\..\tests\test_generic\genericTest.cpp">
Modified: UDM/trunk/Projects/Win32/VC10/tests/test_generic2/test_generic2.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/test_generic2/test_generic2.vcxproj Thu Aug 25 14:11:18 2011 (r3842)
+++ UDM/trunk/Projects/Win32/VC10/tests/test_generic2/test_generic2.vcxproj Thu Aug 25 14:38:42 2011 (r3843)
@@ -93,14 +93,24 @@
<TargetMachine>MachineX86</TargetMachine>
</Link>
<PostBuildEvent>
- <Command>cd "$(OutDir)Gen\tests\test_generic2"
-"$(TargetPath)"
-</Command>
+ <Command>
+ </Command>
</PostBuildEvent>
<PreBuildEvent>
<Command>
</Command>
</PreBuildEvent>
+ <CustomBuildStep>
+ <Command>cd "$(OutDir)Gen\tests\test_generic2"
+"$(TargetPath)"
+</Command>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Message>Running $(TargetName)</Message>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Outputs>None</Outputs>
+ </CustomBuildStep>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Midl>
@@ -144,10 +154,20 @@
<TargetMachine>MachineX86</TargetMachine>
</Link>
<PostBuildEvent>
+ <Command>
+ </Command>
+ </PostBuildEvent>
+ <CustomBuildStep>
<Command>cd "$(OutDir)Gen\tests\test_generic2"
"$(TargetPath)"
</Command>
- </PostBuildEvent>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Message>Running $(TargetName)</Message>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Outputs>None</Outputs>
+ </CustomBuildStep>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\..\tests\test_generic2\genericTest.cpp">
Modified: UDM/trunk/Projects/Win32/VC10/tests/test_libs/test_libs.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/test_libs/test_libs.vcxproj Thu Aug 25 14:11:18 2011 (r3842)
+++ UDM/trunk/Projects/Win32/VC10/tests/test_libs/test_libs.vcxproj Thu Aug 25 14:38:42 2011 (r3843)
@@ -68,10 +68,20 @@
<TargetMachine>MachineX86</TargetMachine>
</Link>
<PostBuildEvent>
+ <Command>
+ </Command>
+ </PostBuildEvent>
+ <CustomBuildStep>
<Command>cd "$(OutDir)Gen\samples"
"$(TargetPath)"
</Command>
- </PostBuildEvent>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Message>Running $(TargetName)</Message>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Outputs>NONE</Outputs>
+ </CustomBuildStep>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
@@ -94,15 +104,25 @@
<TargetMachine>MachineX86</TargetMachine>
</Link>
<PostBuildEvent>
- <Command>cd "$(OutDir)Gen\samples"
-"$(TargetPath)"
-</Command>
+ <Command>
+ </Command>
</PostBuildEvent>
<PreBuildEvent>
<Command>mkdir "$(OutDir)Gen\tests\test_libs"
exit 0
</Command>
</PreBuildEvent>
+ <CustomBuildStep>
+ <Command>cd "$(OutDir)Gen\samples"
+"$(TargetPath)"
+</Command>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Message>Running $(TargetName)</Message>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Outputs>NONE</Outputs>
+ </CustomBuildStep>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\..\tests\test_libs\LibsTest.cpp" />
Modified: UDM/trunk/Projects/Win32/VC10/tests/test_ns/test_ns.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/test_ns/test_ns.vcxproj Thu Aug 25 14:11:18 2011 (r3842)
+++ UDM/trunk/Projects/Win32/VC10/tests/test_ns/test_ns.vcxproj Thu Aug 25 14:38:42 2011 (r3843)
@@ -45,6 +45,7 @@
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)obj\tests\$(ProjectName)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)D</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
@@ -66,8 +67,6 @@
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>UdmDllD.lib;xerces-c_2D.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)test_nsD.exe</OutputFile>
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)test_ns.pdb</ProgramDatabaseFile>
@@ -76,12 +75,21 @@
<DataExecutionPrevention>
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
+ <AdditionalDependencies>cppunitd.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
+ <Command>
+ </Command>
+ </PostBuildEvent>
+ <CustomBuildStep>
<Command>cd "$(OutDir)Gen\tests\test_ns"
"$(TargetPath)"
</Command>
- </PostBuildEvent>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Outputs>NONE</Outputs>
+ <Message>Running $(TargetName)</Message>
+ </CustomBuildStep>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreBuildEvent>
@@ -113,10 +121,18 @@
<TargetMachine>MachineX86</TargetMachine>
</Link>
<PostBuildEvent>
+ <Command>
+ </Command>
+ </PostBuildEvent>
+ <CustomBuildStep>
<Command>cd "$(OutDir)Gen\tests\test_ns"
"$(TargetPath)"
</Command>
- </PostBuildEvent>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Outputs>NONE</Outputs>
+ <Message>Running $(TargetName)</Message>
+ </CustomBuildStep>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\..\tests\test_ns\main.cpp" />
@@ -165,4 +181,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
Modified: UDM/trunk/Projects/Win32/VC10/tests/test_ns2/test_ns2.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/test_ns2/test_ns2.vcxproj Thu Aug 25 14:11:18 2011 (r3842)
+++ UDM/trunk/Projects/Win32/VC10/tests/test_ns2/test_ns2.vcxproj Thu Aug 25 14:38:42 2011 (r3843)
@@ -30,10 +30,12 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
<Import Project="..\cppunit.props" />
+ <Import Project="..\UdmTests.props" />
</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')" />
<Import Project="..\cppunit.props" />
+ <Import Project="..\UdmTests.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
@@ -45,6 +47,7 @@
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)obj\tests\$(ProjectName)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)D</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
@@ -66,8 +69,7 @@
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>UdmDllD.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)test_ns2D.exe</OutputFile>
+ <AdditionalDependencies>cppunitd.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)test_ns2.pdb</ProgramDatabaseFile>
@@ -78,10 +80,18 @@
<TargetMachine>MachineX86</TargetMachine>
</Link>
<PostBuildEvent>
+ <Command>
+ </Command>
+ </PostBuildEvent>
+ <CustomBuildStep>
<Command>cd "$(OutDir)Gen\tests\test_ns2"
"$(TargetPath)"
</Command>
- </PostBuildEvent>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Message>Running $(TargetName)</Message>
+ <Outputs>NONE</Outputs>
+ </CustomBuildStep>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreBuildEvent>
@@ -113,10 +123,18 @@
<TargetMachine>MachineX86</TargetMachine>
</Link>
<PostBuildEvent>
+ <Command>
+ </Command>
+ </PostBuildEvent>
+ <CustomBuildStep>
<Command>cd "$(OutDir)Gen\tests\test_ns2"
"$(TargetPath)"
</Command>
- </PostBuildEvent>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Message>Running $(TargetName)</Message>
+ <Outputs>NONE</Outputs>
+ </CustomBuildStep>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\test_ns2\CHost.cpp">
@@ -180,4 +198,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
Modified: UDM/trunk/Projects/Win32/VC10/tests/test_simpleudmops/LampTest.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/test_simpleudmops/LampTest.vcxproj Thu Aug 25 14:11:18 2011 (r3842)
+++ UDM/trunk/Projects/Win32/VC10/tests/test_simpleudmops/LampTest.vcxproj Thu Aug 25 14:38:42 2011 (r3843)
@@ -94,6 +94,21 @@
"$(TargetPath)"
</Command>
</PostBuildEvent>
+ <PreBuildEvent>
+ <Command>
+ </Command>
+ </PreBuildEvent>
+ <CustomBuildStep>
+ <Command>cd "$(OutDir)Gen\samples"
+"$(TargetPath)"
+</Command>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Message>Running $(TargetName)</Message>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Outputs>NONE</Outputs>
+ </CustomBuildStep>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Midl>
@@ -137,10 +152,20 @@
<TargetMachine>MachineX86</TargetMachine>
</Link>
<PostBuildEvent>
+ <Command>
+ </Command>
+ </PostBuildEvent>
+ <CustomBuildStep>
<Command>cd "$(OutDir)Gen\samples"
"$(TargetPath)"
</Command>
- </PostBuildEvent>
+ <Message>Running $(TargetName)</Message>
+ <Outputs>NONE</Outputs>
+ </CustomBuildStep>
+ <PreBuildEvent>
+ <Command>
+ </Command>
+ </PreBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\..\tests\test_simpleudmops\LampTest.cpp">
More information about the Mobies-commit
mailing list