diff options
| author | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-12 19:07:03 +0000 |
|---|---|---|
| committer | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-12 19:07:03 +0000 |
| commit | fc642ec6bb1192fef3ff85aafba345a802c06f3d (patch) | |
| tree | c36bd37faafb1ef60bd94ad1307ab9ac1866f1af | |
| parent | 8674b318ac2b973317feb982316779d28fad2b71 (diff) | |
| download | chromium_src-fc642ec6bb1192fef3ff85aafba345a802c06f3d.zip chromium_src-fc642ec6bb1192fef3ff85aafba345a802c06f3d.tar.gz chromium_src-fc642ec6bb1192fef3ff85aafba345a802c06f3d.tar.bz2 | |
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
Review URL: https://chromiumcodereview.appspot.com/11111014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161633 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | base/base.gyp | 10 | ||||
| -rw-r--r-- | build/common.gypi | 4 | ||||
| -rw-r--r-- | net/net.gyp | 9 | ||||
| -rw-r--r-- | sync/sync.gyp | 9 |
4 files changed, 31 insertions, 1 deletions
diff --git a/base/base.gyp b/base/base.gyp index eb2429b..eb586e8 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 + 'sources!': [ + 'json/json_reader_unittest.cc', + 'string_piece_unittest.cc', + ], + }], + ], 'actions': [ { 'action_name': 'copy_test_data', diff --git a/build/common.gypi b/build/common.gypi index 92dfe91..bfa6385 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. diff --git a/net/net.gyp b/net/net.gyp index b4cf974..f73ce50 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 + 'sources!': [ + 'base/transport_security_state_unittest.cc', + ], + }], + ], }], [ 'OS == "linux"', { 'dependencies': [ diff --git a/sync/sync.gyp b/sync/sync.gyp index f216a29..b0805fd 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 + 'sources!': [ + 'engine/syncer_unittest.cc', + ], + }], + ], }, }, |