Skip to content

Adding a new configuration to build binaries for code coverage analysis #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chakrabot merged 1 commit into from
Jan 8, 2016
Merged

Adding a new configuration to build binaries for code coverage analysis #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions Build/Chakra.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,14 @@
$(ChakraCoreRootDirectory)\lib\common\placeholder;
%(AdditionalIncludeDirectories)
</AdditionalIncludeDirectories>

<!-- ======== For Code Covearge ======== -->
<Optimization Condition="'$(ENABLE_CODECOVERAGE)'=='true'">Disabled</Optimization>
</ClCompile>

<Link>
<!-- ======== For Code Covearge ======== -->
<AdditionalOptions Condition="'$(ENABLE_CODECOVERAGE)'=='true'">%(AdditionalOptions) /DEBUGTYPE:CV,FIXUP</AdditionalOptions>
</Link>
</ItemDefinitionGroup>
</Project>
1 change: 1 addition & 0 deletions Build/Common.Build.Default.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@

<!-- Output directories -->
<PropertyGroup>
<OutDirName Condition="'$(ENABLE_CODECOVERAGE)'=='true'">codecoverage</OutDirName>
<OutDirName Condition="'$(OutDirName)'==''">$(Configuration.ToLower())</OutDirName>
<OutDir>$(OutBaseDir)\bin\$(PlatformPathName.ToLower())_$(OutDirName)\</OutDir>
<IntDir>$(IntBaseDir)\obj\$(PlatformPathName.ToLower())_$(Configuration.ToLower())\$(MSBuildProjectName)\</IntDir>
Expand Down
3 changes: 1 addition & 2 deletions Build/scripts/post_build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ param (
[ValidateSet("x86", "x64", "arm", "*")]
[string]$arch="*",

[ValidateSet("debug", "release", "test", "*")]
[ValidateSet("debug", "release", "test", "codecoverage", "*")]
[string]$flavor = "*",

[string]$srcpath = "",
Expand All @@ -23,7 +23,6 @@ param (

$global:exitcode = 0


if ($arch -eq "*") {

. "$PSScriptRoot\util.ps1"
Expand Down
6 changes: 6 additions & 0 deletions test/runtests.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ goto :main
echo.
echo -debug Build type of binaries is debug
echo -test Build type of binaries is test
echo -codecoverage Build type of binaries is codecoverage
echo.
echo Shorthand combinations can be used, e.g. -x64debug
echo.
Expand Down Expand Up @@ -134,13 +135,17 @@ goto :main
if /i "%1" == "-arm" set _BuildArch=arm& goto :ArgOk
if /i "%1" == "-debug" set _BuildType=debug& goto :ArgOk
if /i "%1" == "-test" set _BuildType=test& goto :ArgOk
if /i "%1" == "-codecoverage" set _BuildType=codecoverage& goto :ArgOk
Copy link
Collaborator

@ianwjhalliday ianwjhalliday Jan 8, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we also update :printUsage above with -codecoverage


if /i "%1" == "-x86debug" set _BuildArch=x86&set _BuildType=debug& goto :ArgOk
if /i "%1" == "-x64debug" set _BuildArch=x64&set _BuildType=debug& goto :ArgOk
if /i "%1" == "-armdebug" set _BuildArch=arm&set _BuildType=debug& goto :ArgOk
if /i "%1" == "-x86test" set _BuildArch=x86&set _BuildType=test& goto :ArgOk
if /i "%1" == "-x64test" set _BuildArch=x64&set _BuildType=test& goto :ArgOk
if /i "%1" == "-armtest" set _BuildArch=arm&set _BuildType=test& goto :ArgOk
if /i "%1" == "-x86codecoverage" set _BuildArch=x86&set _BuildType=codecoverage& goto :ArgOk
if /i "%1" == "-x64codecoverage" set _BuildArch=x64&set _BuildType=codecoverage& goto :ArgOk
if /i "%1" == "-armcodecoverage" set _BuildArch=arm&set _BuildType=codecoverage& goto :ArgOk

if /i "%1" == "-binary" set _Binary=-binary:%2& goto :ArgOkShift2
if /i "%1" == "-bindir" set _BinDir=%~f2& goto :ArgOkShift2
Expand Down Expand Up @@ -318,6 +323,7 @@ goto :main
if "%_BuildArchMapped%" == "x64" set _BuildArchMapped=amd64
if "%_BuildTypeMapped%" == "debug" set _BuildTypeMapped=chk
if "%_BuildTypeMapped%" == "test" set _BuildTypeMapped=fre
if "%_BuildTypeMapped%" == "codecoverage" set _BuildTypeMapped=fre

if "%Disable_JIT%" == "1" (
set _dynamicprofilecache=
Expand Down