test coverage fix in Jamfile
This commit is contained in:
parent
678385f358
commit
d2546cc592
10
Jamfile
10
Jamfile
|
@ -28,6 +28,11 @@ VERSION = 1.1.0 ;
|
||||||
rule coverage ( properties * )
|
rule coverage ( properties * )
|
||||||
{
|
{
|
||||||
local result ;
|
local result ;
|
||||||
|
if ! <test-coverage>on
|
||||||
|
{
|
||||||
|
return $(result) ;
|
||||||
|
}
|
||||||
|
|
||||||
if <toolset>gcc in $(properties)
|
if <toolset>gcc in $(properties)
|
||||||
|| <toolset>darwin in $(properties)
|
|| <toolset>darwin in $(properties)
|
||||||
|| <toolset>clang in $(properties)
|
|| <toolset>clang in $(properties)
|
||||||
|
@ -35,7 +40,6 @@ rule coverage ( properties * )
|
||||||
result += <cxxflags>-fprofile-arcs <cxxflags>-ftest-coverage ;
|
result += <cxxflags>-fprofile-arcs <cxxflags>-ftest-coverage ;
|
||||||
|
|
||||||
if <toolset>gcc in $(properties)
|
if <toolset>gcc in $(properties)
|
||||||
|| <toolset>darwin in $(properties)
|
|
||||||
{
|
{
|
||||||
result += <linkflags>-lgcov ;
|
result += <linkflags>-lgcov ;
|
||||||
}
|
}
|
||||||
|
@ -426,8 +430,7 @@ feature boost-link : static shared : propagated composite ;
|
||||||
feature debug-iterators : off on : composite propagated link-incompatible ;
|
feature debug-iterators : off on : composite propagated link-incompatible ;
|
||||||
feature.compose <debug-iterators>on : <define>_SCL_SECURE=1 <define>_GLIBCXX_DEBUG ;
|
feature.compose <debug-iterators>on : <define>_SCL_SECURE=1 <define>_GLIBCXX_DEBUG ;
|
||||||
|
|
||||||
feature test-coverage : off on : composite propagated ;
|
feature test-coverage : off on : composite propagated link-incompatible ;
|
||||||
feature.compose <test-coverage>on : <conditional>@coverage ;
|
|
||||||
|
|
||||||
feature fpic : off on : composite propagated link-incompatible ;
|
feature fpic : off on : composite propagated link-incompatible ;
|
||||||
feature.compose <fpic>on : <cflags>-fPIC ;
|
feature.compose <fpic>on : <cflags>-fPIC ;
|
||||||
|
@ -670,6 +673,7 @@ local usage-requirements =
|
||||||
# enable cancel support in asio
|
# enable cancel support in asio
|
||||||
<define>BOOST_ASIO_ENABLE_CANCELIO
|
<define>BOOST_ASIO_ENABLE_CANCELIO
|
||||||
<conditional>@linking
|
<conditional>@linking
|
||||||
|
<conditional>@coverage
|
||||||
# these compiler settings just makes the compiler standard conforming
|
# these compiler settings just makes the compiler standard conforming
|
||||||
<toolset>msvc:<cflags>/Zc:wchar_t
|
<toolset>msvc:<cflags>/Zc:wchar_t
|
||||||
<toolset>msvc:<cflags>/Zc:forScope
|
<toolset>msvc:<cflags>/Zc:forScope
|
||||||
|
|
Loading…
Reference in New Issue