1. Matt Oswald
  2. xUnit++

Commits

Matt Oswald  committed 52a5f21

updated output directories/names

  • Participants
  • Parent commits de35c87
  • Branches default

Comments (0)

Files changed (6)

File .build/output.props

View file
  • Ignore whitespace
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Label="UserMacros" Condition="'$(Configuration)' == 'Debug'">
+    <DebugTag>.Debug</DebugTag>
+  </PropertyGroup>
+  <PropertyGroup Label="UserMacros" Condition="'$(Configuration)' != 'Debug'">
+    <DebugTag />
+  </PropertyGroup>
   <PropertyGroup>
-    <OutDir>$(SolutionDir)bin\$(ProjectName)\$(Configuration)\$(PlatformShortName)\</OutDir>
-    <IntDir>$(SolutionDir)int\$(ProjectName)\$(Configuration)\$(PlatformShortName)\</IntDir>
+    <OutDir>$(ProjectDir)..\bin\$(ProjectName)\</OutDir>
+    <IntDir>$(ProjectDir)..\int\$(ProjectName)\$(Configuration)\$(PlatformShortName)\</IntDir>
+    <TargetName>$(ProjectName).$(PlatformShortName)$(DebugTag)</TargetName>
   </PropertyGroup>
-  <ItemDefinitionGroup />
-  <ItemGroup />
-</Project>
+  <ItemGroup>
+    <BuildMacro Include="DebugTag">
+      <Value>$(DebugTag)</Value>
+    </BuildMacro>
+  </ItemGroup>
+</Project>

File .build/tests_output.props

View file
  • Ignore whitespace
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets" />
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <OutDir>$(ProjectDir)..\..\bin\$(ProjectName)\</OutDir>
+    <IntDir>$(ProjectDir)..\..\int\$(ProjectName)\$(Configuration)\$(PlatformShortName)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup />
+  <ItemGroup />
+</Project>

File Tests/BareTests/BareTests.vcxproj

View file
  • Ignore whitespace
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\.build\output.props" />
+    <Import Project="..\..\.build\tests_output.props" />
     <Import Project="..\..\.build\build.props" />
     <Import Project="..\..\.build\debug.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\.build\output.props" />
+      <Import Project="..\..\.build\tests_output.props" />
     <Import Project="..\..\.build\build.props" />
     <Import Project="..\..\.build\debug.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\.build\output.props" />
+      <Import Project="..\..\.build\tests_output.props" />
     <Import Project="..\..\.build\build.props" />
     <Import Project="..\..\.build\release.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\.build\output.props" />
+      <Import Project="..\..\.build\tests_output.props" />
     <Import Project="..\..\.build\build.props" />
     <Import Project="..\..\.build\release.props" />
   </ImportGroup>
       <AdditionalIncludeDirectories>$(SolutionDir)xUnit++</AdditionalIncludeDirectories>
     </ClCompile>
     <PostBuildEvent>
-      <Command>"$(OutputPath)../../../xUnit++.console/$(Configuration)/$(PlatformShortName)/xUnit++.console.exe" "$(TargetPath)"</Command>
+      <Command>"$(OutputPath)../xUnit++.console/xUnit++.console.$(PlatformShortName)$(DebugTag).exe" "$(TargetPath)"</Command>
     </PostBuildEvent>
     <PostBuildEvent>
       <Message>Running Bare Tests...</Message>
     <ClCompile>
       <AdditionalIncludeDirectories>$(SolutionDir)xUnit++</AdditionalIncludeDirectories>
     </ClCompile>
+    <PostBuildEvent>
+      <Command>"$(OutputPath)../xUnit++.console/xUnit++.console.$(PlatformShortName)$(DebugTag).exe" "$(TargetPath)"</Command>
+      <Message>Running Bare Tests...</Message>
+    </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>

File Tests/UnitTests/UnitTests.vcxproj

View file
  • Ignore whitespace
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\.build\output.props" />
+      <Import Project="..\..\.build\tests_output.props" />
     <Import Project="..\..\.build\build.props" />
     <Import Project="..\..\.build\debug.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\.build\output.props" />
+      <Import Project="..\..\.build\tests_output.props" />
     <Import Project="..\..\.build\build.props" />
     <Import Project="..\..\.build\debug.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\.build\output.props" />
+      <Import Project="..\..\.build\tests_output.props" />
     <Import Project="..\..\.build\build.props" />
     <Import Project="..\..\.build\release.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\.build\output.props" />
+      <Import Project="..\..\.build\tests_output.props" />
     <Import Project="..\..\.build\build.props" />
     <Import Project="..\..\.build\release.props" />
   </ImportGroup>

File notes.txt

View file
  • Ignore whitespace
     - ensure output formats
     - ensure all failing assert types actually increment count of failed tests
     - include new Check asserts
+    - several tests (look at Theory.cpp) do not actually assert anything happened
 check Release builds for warnings (and failing tests)
-can runner be made configuration agnostic? (ie, can debug runner load release tests, and vice versa?)
-redo include/lib structure, output locations for each project
+can runner be made configuration agnostic? (ie, can debug runner load release tests, and vice versa? (and what about x64?)
+redo include structure
 vsix project needs embedded eula and license
 need license for whole project
 clean up the Runner project (many unneeded files)

File xUnit++.sln

View file
  • Ignore whitespace
 		{25DF3961-F288-4A96-AE6B-A4950A00AB8E} = {25DF3961-F288-4A96-AE6B-A4950A00AB8E}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Property Sheets", "Property Sheets", "{F6F70924-B364-4ECB-B0A9-BAFE00E343EB}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{AFBBD3E4-82D4-488E-949B-C50B2D9222A3}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xUnit++.console", "xUnit++.console\xUnit++.console.vcxproj", "{2F1709B8-9F5A-4625-9404-C348298181B7}"