Add support for coverage=1 builds on iOS

Add support for coverage=1 builds on iOS

Uses the same method as is used on Mac to enable coverage. Some sources
need to be removed in coverage mode due to a toolchain bug.

BUG=None


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=161633

[stuartmorgan, 2012-10-12 08:09:34]

mark: for review + base OWNERS
rsleevi, akalin: for net/sync OWNERS

[akalin, 2012-10-12 10:19:07]

On 2012/10/12 08:09:34, stuartmorgan wrote:
> mark: for review + base OWNERS
> rsleevi, akalin: for net/sync OWNERS

sync lgtm

[Mark Mentovai, 2012-10-12 13:22:24]

LGTM for both review and OWNERS approval.

https://codereview.chromium.org/11111014/diff/2001/base/base.gyp
File base/base.gyp (right):

https://codereview.chromium.org/11111014/diff/2001/base/base.gyp#newcode586
base/base.gyp:586: # bug: http://openradar.appspot.com/radar?id=1499403
Gross.

[Ryan Sleevi, 2012-10-12 14:56:20]

lgtm
On Oct 12, 2012 1:09 AM, <stuartmorgan@chromium.org> wrote:

> Reviewers: Mark Mentovai, Ryan Sleevi, akalin,
>
> Message:
> mark: for review + base OWNERS
> rsleevi, akalin: for net/sync OWNERS
>
> Description:
> Add support for coverage=1 builds on iOS
>
> Uses the same method as is used on Mac to enable coverage. Some sources
> need to be removed in coverage mode due to a toolchain bug.
>
> BUG=None
>
>
> Please review this at
https://codereview.chromium.**org/11111014/<https://codereview.chromium.org/1...
>
> SVN Base:
http://git.chromium.org/**chromium/src.git@master<http://git.chromium.org/chr...
>
> Affected files:
>   M base/base.gyp
>   M build/common.gypi
>   M net/net.gyp
>   M sync/sync.gyp
>
>
> Index: base/base.gyp
> diff --git a/base/base.gyp b/base/base.gyp
> index eb2429b9b3b5ab9c239aee8aba0dfe**7eefe75659..**
> eb586e81a60304197c6d17b4becc6f**b881139133 100644
> --- a/base/base.gyp
> +++ b/base/base.gyp
> @@ -580,6 +580,16 @@
>              # Unittests that don't pass.
>              ['exclude', '^message_loop_unittest\\.cc$'**],
>            ],
> +          'conditions': [
> +            ['coverage != 0', {
> +              # These sources can't be built with coverage due to a
> toolchain
> +              # bug:
http://openradar.appspot.com/**radar?id=1499403<http://openradar.appspot.com/...
> +              'sources!': [
> +                'json/json_reader_unittest.cc'**,
> +                'string_piece_unittest.cc',
> +              ],
> +            }],
> +          ],
>            'actions': [
>              {
>                'action_name': 'copy_test_data',
> Index: build/common.gypi
> diff --git a/build/common.gypi b/build/common.gypi
> index 92dfe9189ad0d9f532f00e928ff27a**f58bd586d3..**
> bfa63857ac08ea49f7a08a3234351a**ef542e5e61 100644
> --- a/build/common.gypi
> +++ b/build/common.gypi
> @@ -1661,11 +1661,13 @@
>        }],
>        ['coverage!=0', {
>          'conditions': [
> -          ['OS=="mac"', {
> +          ['OS=="mac" or OS=="ios"', {
>              'xcode_settings': {
>                'GCC_INSTRUMENT_PROGRAM_FLOW_**ARCS': 'YES',  #
> -fprofile-arcs
>                'GCC_GENERATE_TEST_COVERAGE_**FILES': 'YES',  #
> -ftest-coverage
>              },
> +          }],
> +          ['OS=="mac"', {
>              # Add -lgcov for types executable, shared_library, and
>              # loadable_module; not for static_library.
>              # This is a delayed conditional.
> Index: net/net.gyp
> diff --git a/net/net.gyp b/net/net.gyp
> index b4cf974fc7ae050605062d36db882a**a54d97252d..**
> f73ce50337801c8c84db7485a4a431**a2496edff7 100644
> --- a/net/net.gyp
> +++ b/net/net.gyp
> @@ -1583,6 +1583,15 @@
>                # OS is not "linux" or "freebsd" or "openbsd".
>                'base/unix_domain_socket_**posix_unittest.cc',
>              ],
> +            'conditions': [
> +              ['coverage != 0', {
> +                # These sources can't be built with coverage due to a
> toolchain
> +                # bug:
http://openradar.appspot.com/**radar?id=1499403<http://openradar.appspot.com/...
> +                'sources!': [
> +                  'base/transport_security_**state_unittest.cc',
> +                ],
> +              }],
> +            ],
>          }],
>          [ 'OS == "linux"', {
>              'dependencies': [
> Index: sync/sync.gyp
> diff --git a/sync/sync.gyp b/sync/sync.gyp
> index f216a297d132a5b63fc9e8b7b94f12**8794ca11d7..**
> b0805fd742adac9b06eb5d25497ec3**22eb31d79b 100644
> --- a/sync/sync.gyp
> +++ b/sync/sync.gyp
> @@ -638,6 +638,15 @@
>            'util/protobuf_unittest.cc',
>            'internal_api/public/util/**weak_handle_unittest.cc',
>          ],
> +        'conditions': [
> +          ['OS == "ios" and coverage != 0', {
> +            # These sources can't be built with coverage due to a
> toolchain
> +            # bug:
http://openradar.appspot.com/**radar?id=1499403<http://openradar.appspot.com/...
> +            'sources!': [
> +              'engine/syncer_unittest.cc',
> +            ],
> +          }],
> +        ],
>        },
>      },
>
>
>
>

[commit-bot: I haz the power, 2012-10-12 14:57:20]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/stuartmorgan@chromium.org/11111014/2001

[commit-bot: I haz the power, 2012-10-12 19:07:10]

Change committed as 161633