| Index: chrome_frame/chrome_frame.gyp
|
| diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp
|
| index f19db685bd7abf7bedca89855917e36fe93484ad..cf85067211493c7f1787cc848e64993f3c32b337 100644
|
| --- a/chrome_frame/chrome_frame.gyp
|
| +++ b/chrome_frame/chrome_frame.gyp
|
| @@ -154,20 +154,6 @@
|
| '<(INTERMEDIATE_DIR)',
|
| ],
|
| 'conditions': [
|
| - # We can't instrument code for coverage if it depends on 3rd party
|
| - # binaries that we don't have PDBs for. See here for more details:
|
| - # http://connect.microsoft.com/VisualStudio/feedback/details/176188/can-not-disable-warning-lnk4099
|
| - ['coverage==0', {
|
| - 'conditions': [
|
| - ['OS=="win"', {
|
| - 'dependencies': [
|
| - '../breakpad/breakpad.gyp:breakpad_handler',
|
| - # TODO(slightlyoff): Get automation targets working on OS X
|
| - '../chrome/chrome.gyp:automation',
|
| - ],
|
| - }],
|
| - ],
|
| - }],
|
| ['OS=="win" and buildtype=="Official"', {
|
| 'configurations': {
|
| 'Release': {
|
| @@ -192,6 +178,7 @@
|
| },
|
| },
|
| 'dependencies': [
|
| + '../breakpad/breakpad.gyp:breakpad_handler',
|
| # TODO(slightlyoff): Get automation targets working on OS X
|
| '../chrome/chrome.gyp:automation',
|
| '../chrome/chrome.gyp:installer_util',
|
| @@ -962,141 +949,4 @@
|
| ],
|
| },
|
| ],
|
| - 'conditions': [
|
| - # To enable the coverage targets, do
|
| - # GYP_DEFINES='coverage=1' gclient sync
|
| - ['coverage!=0',
|
| - { 'targets': [
|
| - {
|
| - # Coverage BUILD AND RUN.
|
| - # Not named coverage_build_and_run for historical reasons.
|
| - 'target_name': 'gcf_coverage',
|
| - 'dependencies': [ 'gcf_coverage_build', 'gcf_coverage_run' ],
|
| - # do NOT place this in the 'all' list; most won't want it.
|
| - 'suppress_wildcard': 1,
|
| - 'type': 'none',
|
| - 'actions': [
|
| - {
|
| - 'message': 'Coverage is now complete',
|
| - # MSVS must have an input file and an output file.
|
| - 'inputs': [ '<(PRODUCT_DIR)/gcf_coverage.info' ],
|
| - 'outputs': [ '<(PRODUCT_DIR)/gcf_coverage-build-and-run.stamp' ],
|
| - 'action_name': 'gcf_coverage',
|
| - # Wish gyp had some basic builtin commands (e.g. 'touch').
|
| - 'action': [ 'python', '-c',
|
| - 'import os; ' \
|
| - 'open(' \
|
| - '\'<(PRODUCT_DIR)\' + os.path.sep + ' \
|
| - '\'gcf_coverage-build-and-run.stamp\'' \
|
| - ', \'w\').close()' ],
|
| - # Use outputs of this action as inputs for the main target build.
|
| - # Seems as a misnomer but makes this happy on Linux (scons).
|
| - 'process_outputs_as_sources': 1,
|
| - },
|
| - ],
|
| - },
|
| - # Coverage BUILD. Compile only; does not run the bundles.
|
| - # Intended as the build phase for our coverage bots.
|
| - #
|
| - # Builds unit test bundles needed for coverage.
|
| - # Outputs this list of bundles into gcf_coverage_bundles.py.
|
| - #
|
| - # If you want to both build and run coverage from your IDE,
|
| - # use the 'gcf_coverage' target.
|
| - {
|
| - 'target_name': 'gcf_coverage_build',
|
| - 'suppress_wildcard': 1,
|
| - 'type': 'none',
|
| - 'dependencies': [
|
| - # Some tests are disabled because they depend on browser.lib which
|
| - # has some trouble to link with instrumentation. Until this is
|
| - # fixed on the Chrome side we won't get complete coverage from
|
| - # our tests but we at least get the process rolling...
|
| - # TODO(mad): FIX THIS!
|
| - #'chrome_frame_net_tests',
|
| - #'chrome_frame_reliability_tests',
|
| -
|
| - # Other tests depend on Chrome bins being available when they run.
|
| - # Those should be re-enabled as soon as we setup the build slave to
|
| - # also build (or download an archive of) Chrome, even it it isn't
|
| - # instrumented itself.
|
| - # TODO(mad): FIX THIS!
|
| - #'chrome_frame_perftests',
|
| - #'chrome_frame_tests',
|
| -
|
| - 'chrome_frame_unittests',
|
| - ], # 'dependencies'
|
| - 'actions': [
|
| - {
|
| - # TODO(jrg):
|
| - # Technically I want inputs to be the list of
|
| - # executables created in <@(_dependencies) but use of
|
| - # that variable lists the dep by dep name, not their
|
| - # output executable name.
|
| - # Is there a better way to force this action to run, always?
|
| - #
|
| - # If a test bundle is added to this gcf_coverage_build target it
|
| - # necessarily means this file (chrome_frame.gyp) is changed,
|
| - # so the action is run (gcf_coverage_bundles.py is generated).
|
| - # Exceptions to that rule are theoretically possible
|
| - # (e.g. re-gyp with a GYP_DEFINES set).
|
| - # Else it's the same list of bundles as last time. They are
|
| - # built (since on the deps list) but the action may not run.
|
| - # For now, things work, but it's less than ideal.
|
| - 'inputs': [ 'chrome_frame.gyp' ],
|
| - 'outputs': [ '<(PRODUCT_DIR)/gcf_coverage_bundles.py' ],
|
| - 'action_name': 'gcf_coverage_build',
|
| - 'action': [ 'python', '-c',
|
| - 'import os; '
|
| - 'f = open(' \
|
| - '\'<(PRODUCT_DIR)\' + os.path.sep + ' \
|
| - '\'gcf_coverage_bundles.py\'' \
|
| - ', \'w\'); ' \
|
| - 'deplist = \'' \
|
| - '<@(_dependencies)' \
|
| - '\'.split(\' \'); ' \
|
| - 'f.write(str(deplist)); ' \
|
| - 'f.close()'],
|
| - # Use outputs of this action as inputs for the main target build.
|
| - # Seems as a misnomer but makes this happy on Linux (scons).
|
| - 'process_outputs_as_sources': 1,
|
| - },
|
| - ],
|
| - },
|
| - # Coverage RUN. Does not actually compile the bundles (though it
|
| - # depends on the gcf_coverage_build step which will do it).
|
| - # This target mirrors the run_coverage_bundles buildbot phase.
|
| - # If you update this command update the mirror in
|
| - # $BUILDBOT/scripts/master/factory/chromium_commands.py.
|
| - # If you want both build and run, use the 'gcf_coverage' target which
|
| - # adds a bit more magic to identify if we need to run or not.
|
| - {
|
| - 'target_name': 'gcf_coverage_run',
|
| - 'dependencies': [ 'gcf_coverage_build' ],
|
| - 'suppress_wildcard': 1,
|
| - 'type': 'none',
|
| - 'actions': [
|
| - {
|
| - # MSVS must have an input file and an output file.
|
| - 'inputs': [ '<(PRODUCT_DIR)/gcf_coverage_bundles.py' ],
|
| - 'outputs': [ '<(PRODUCT_DIR)/gcf_coverage.info' ],
|
| - 'action_name': 'gcf_coverage_run',
|
| - 'action': [ 'python',
|
| - '../tools/code_coverage/coverage_posix.py',
|
| - '--directory',
|
| - '<(PRODUCT_DIR)',
|
| - '--src_root',
|
| - '.',
|
| - '--bundles',
|
| - '<(PRODUCT_DIR)/gcf_coverage_bundles.py',
|
| - ],
|
| - # Use outputs of this action as inputs for the main target build.
|
| - # Seems as a misnomer but makes this happy on Linux (scons).
|
| - 'process_outputs_as_sources': 1,
|
| - },
|
| - ],
|
| - },
|
| - ],
|
| - }, ], # 'coverage!=0'
|
| - ], # 'conditions'
|
| }
|
|
|