Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 1 addition & 31 deletions Coverage-x86/Coverage-x86.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="Shared">
<Import Project="..\Coverage\Shared\Shared.vcxitems" Label="Shared" />
</ImportGroup>
<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" />
Expand Down Expand Up @@ -127,37 +128,6 @@
<AdditionalDependencies>dbghelp.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="..\Coverage\base64.h" />
<ClInclude Include="..\Coverage\BreakpointData.h" />
<ClInclude Include="..\Coverage\CoverageRunner.h" />
<ClInclude Include="..\Coverage\Disassembler\ReachabilityAnalysis.h" />
<ClInclude Include="..\Coverage\Disassembler\X86DisassemblerDecoder.h" />
<ClInclude Include="..\Coverage\Disassembler\X86DisassemblerDecoderCommon.h" />
<ClInclude Include="..\Coverage\FileCallbackInfo.h" />
<ClInclude Include="..\Coverage\FileCoverageV2.h" />
<ClInclude Include="..\Coverage\FileInfo.h" />
<ClInclude Include="..\Coverage\FileLineInfo.h" />
<ClInclude Include="..\Coverage\md5.h" />
<ClInclude Include="..\Coverage\MergeRunner.h" />
<ClInclude Include="..\Coverage\MergeRunnerV1.h" />
<ClInclude Include="..\Coverage\MergeRunnerV2.h" />
<ClInclude Include="..\Coverage\RuntimeNotifications.h" />
<ClInclude Include="..\Coverage\RuntimeOptions.h" />
<ClInclude Include="..\Coverage\Util.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\Coverage\Disassembler\ReachabilityAnalysis.cpp" />
<ClCompile Include="..\Coverage\Disassembler\X86DisassemblerDecoder.cpp" />
<ClCompile Include="..\Coverage\FileInfo.cpp" />
<ClCompile Include="..\Coverage\Main.cpp" />
<ClCompile Include="..\Coverage\MergeRunner.cpp" />
</ItemGroup>
<ItemGroup>
<None Include="..\Coverage\.editorconfig" />
<None Include="..\Coverage\Disassembler\X86GenDisassemblerTables.inc" />
<None Include="..\Coverage\Disassembler\X86GenInstrInfo.inc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
Expand Down
48 changes: 0 additions & 48 deletions Coverage-x86/Coverage-x86.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -5,53 +5,5 @@
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter>
<Filter Include="Disassembler">
<UniqueIdentifier>{701ca765-1c95-4bb0-b030-4ba6c4a3640b}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\Coverage\FileLineInfo.h" />
<ClInclude Include="..\Coverage\RuntimeOptions.h" />
<ClInclude Include="..\Coverage\Util.h" />
<ClInclude Include="..\Coverage\BreakpointData.h" />
<ClInclude Include="..\Coverage\CoverageRunner.h" />
<ClInclude Include="..\Coverage\FileCallbackInfo.h" />
<ClInclude Include="..\Coverage\FileInfo.h" />
<ClInclude Include="..\Coverage\Disassembler\X86DisassemblerDecoder.h">
<Filter>Disassembler</Filter>
</ClInclude>
<ClInclude Include="..\Coverage\Disassembler\X86DisassemblerDecoderCommon.h">
<Filter>Disassembler</Filter>
</ClInclude>
<ClInclude Include="..\Coverage\Disassembler\ReachabilityAnalysis.h">
<Filter>Disassembler</Filter>
</ClInclude>
<ClInclude Include="..\Coverage\RuntimeNotifications.h" />
<ClInclude Include="..\Coverage\MergeRunner.h" />
<ClInclude Include="..\Coverage\base64.h" />
<ClInclude Include="..\Coverage\FileCoverageV2.h" />
<ClInclude Include="..\Coverage\md5.h" />
<ClInclude Include="..\Coverage\MergeRunnerV1.h" />
<ClInclude Include="..\Coverage\MergeRunnerV2.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\Coverage\Main.cpp" />
<ClCompile Include="..\Coverage\Disassembler\ReachabilityAnalysis.cpp">
<Filter>Disassembler</Filter>
</ClCompile>
<ClCompile Include="..\Coverage\Disassembler\X86DisassemblerDecoder.cpp">
<Filter>Disassembler</Filter>
</ClCompile>
<ClCompile Include="..\Coverage\FileInfo.cpp" />
<ClCompile Include="..\Coverage\MergeRunner.cpp" />
</ItemGroup>
<ItemGroup>
<None Include="..\Coverage\Disassembler\X86GenDisassemblerTables.inc">
<Filter>Disassembler</Filter>
</None>
<None Include="..\Coverage\Disassembler\X86GenInstrInfo.inc">
<Filter>Disassembler</Filter>
</None>
<None Include="..\Coverage\.editorconfig" />
</ItemGroup>
</Project>
36 changes: 1 addition & 35 deletions Coverage/Coverage.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="Shared">
<Import Project="Shared\Shared.vcxitems" Label="Shared" />
</ImportGroup>
<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" />
Expand Down Expand Up @@ -136,41 +137,6 @@
<AdditionalDependencies>dbghelp.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="Disassembler\ReachabilityAnalysis.cpp" />
<ClCompile Include="Disassembler\X86DisassemblerDecoder.cpp" />
<ClCompile Include="FileInfo.cpp" />
<ClCompile Include="Main.cpp" />
<ClCompile Include="MergeRunner.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="base64.h" />
<ClInclude Include="BreakpointData.h" />
<ClInclude Include="CallbackInfo.h" />
<ClInclude Include="CoverageRunner.h" />
<ClInclude Include="Disassembler\ReachabilityAnalysis.h" />
<ClInclude Include="Disassembler\X86DisassemblerDecoder.h" />
<ClInclude Include="Disassembler\X86DisassemblerDecoderCommon.h" />
<ClInclude Include="FileCallbackInfo.h" />
<ClInclude Include="FileCoverageV2.h" />
<ClInclude Include="FileInfo.h" />
<ClInclude Include="FileLineInfo.h" />
<ClInclude Include="md5.h" />
<ClInclude Include="MergeRunner.h" />
<ClInclude Include="MergeRunnerV1.h" />
<ClInclude Include="MergeRunnerV2.h" />
<ClInclude Include="ProcessInfo.h" />
<ClInclude Include="ProfileNode.h" />
<ClInclude Include="RuntimeNotifications.h" />
<ClInclude Include="RuntimeOptions.h" />
<ClInclude Include="StackTrace.h" />
<ClInclude Include="Util.h" />
</ItemGroup>
<ItemGroup>
<None Include=".editorconfig" />
<None Include="Disassembler\X86GenDisassemblerTables.inc" />
<None Include="Disassembler\X86GenInstrInfo.inc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
Expand Down
52 changes: 0 additions & 52 deletions Coverage/Coverage.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -5,57 +5,5 @@
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter>
<Filter Include="Disassembler">
<UniqueIdentifier>{61466815-0264-4d18-81fc-e6f4620e6882}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="Main.cpp" />
<ClCompile Include="Disassembler\X86DisassemblerDecoder.cpp">
<Filter>Disassembler</Filter>
</ClCompile>
<ClCompile Include="Disassembler\ReachabilityAnalysis.cpp">
<Filter>Disassembler</Filter>
</ClCompile>
<ClCompile Include="MergeRunner.cpp" />
<ClCompile Include="FileInfo.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="Util.h" />
<ClInclude Include="FileLineInfo.h" />
<ClInclude Include="FileInfo.h" />
<ClInclude Include="BreakpointData.h" />
<ClInclude Include="FileCallbackInfo.h" />
<ClInclude Include="CoverageRunner.h" />
<ClInclude Include="RuntimeOptions.h" />
<ClInclude Include="ProcessInfo.h" />
<ClInclude Include="CallbackInfo.h" />
<ClInclude Include="StackTrace.h" />
<ClInclude Include="ProfileNode.h" />
<ClInclude Include="Disassembler\X86DisassemblerDecoderCommon.h">
<Filter>Disassembler</Filter>
</ClInclude>
<ClInclude Include="Disassembler\X86DisassemblerDecoder.h">
<Filter>Disassembler</Filter>
</ClInclude>
<ClInclude Include="Disassembler\ReachabilityAnalysis.h">
<Filter>Disassembler</Filter>
</ClInclude>
<ClInclude Include="RuntimeNotifications.h" />
<ClInclude Include="MergeRunner.h" />
<ClInclude Include="MergeRunnerV2.h" />
<ClInclude Include="MergeRunnerV1.h" />
<ClInclude Include="md5.h" />
<ClInclude Include="base64.h" />
<ClInclude Include="FileCoverageV2.h" />
</ItemGroup>
<ItemGroup>
<None Include="Disassembler\X86GenDisassemblerTables.inc">
<Filter>Disassembler</Filter>
</None>
<None Include="Disassembler\X86GenInstrInfo.inc">
<Filter>Disassembler</Filter>
</None>
<None Include=".editorconfig" />
</ItemGroup>
</Project>
5 changes: 4 additions & 1 deletion Coverage/CoverageRunner.h
Original file line number Diff line number Diff line change
Expand Up @@ -992,7 +992,10 @@ struct CoverageRunner
}

// Write report of current execution
coverageContext.WriteReport(options.ExportFormat, mergedInfo, outputFile);
{
std::ofstream ofs(outputFile);
coverageContext.WriteReport(options.ExportFormat, mergedInfo, ofs);
}

if (options.isAtLeastLevel(VerboseLevel::Info))
{
Expand Down
Loading