Index: chrome/chrome_tests.gypi |
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi |
index b2473036a9ec93b254f62017983dd464ac2cd414..5128edf11584e7bfdf1ed245b14645b4523ed91e 100644 |
--- a/chrome/chrome_tests.gypi |
+++ b/chrome/chrome_tests.gypi |
@@ -2890,197 +2890,6 @@ |
}, |
]}, # 'targets' |
], # OS=="win" |
- # If you change this condition, make sure you also change it in all.gyp |
- # for the chromium_builder_qa target. |
- # To enable the coverage targets, do |
- # GYP_DEFINES='coverage=1' gclient sync |
- # To match the coverage buildbot more closely, do this: |
- # GYP_DEFINES='coverage=1 enable_svg=0 fastbuild=1' gclient sync |
- # (and, on MacOS, be sure to switch your SDK from "Base SDK" to "Mac OS X |
- # 10.6") |
- # (but on Windows, don't set the fastbuild=1 because it removes the PDB |
- # generation which is necessary for code coverage.) |
- ['coverage!=0', |
- { 'targets': [ |
- { |
- ### Coverage BUILD AND RUN. |
- ### Not named coverage_build_and_run for historical reasons. |
- 'target_name': 'coverage', |
- 'dependencies': [ 'coverage_build', 'coverage_run' ], |
- # do NOT place this in the 'all' list; most won't want it. |
- # In gyp, booleans are 0/1 not True/False. |
- 'suppress_wildcard': 1, |
- 'type': 'none', |
- 'actions': [ |
- { |
- 'message': 'Coverage is now complete', |
- # MSVS must have an input file and an output file. |
- 'inputs': [ '<(PRODUCT_DIR)/coverage.info' ], |
- 'outputs': [ '<(PRODUCT_DIR)/coverage-build-and-run.stamp' ], |
- 'action_name': 'coverage', |
- # Wish gyp had some basic builtin commands (e.g. 'touch'). |
- 'action': [ 'python', '-c', |
- 'import os; ' \ |
- 'open(' \ |
- '\'<(PRODUCT_DIR)\' + os.path.sep + ' \ |
- '\'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, |
- }, |
- ], # 'actions' |
- }, |
- ### 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 coverage_bundles.py. |
- ### |
- ### If you want to both build and run coverage from your IDE, |
- ### use the 'coverage' target. |
- { |
- 'target_name': 'coverage_build', |
- # do NOT place this in the 'all' list; most won't want it. |
- # In gyp, booleans are 0/1 not True/False. |
- 'suppress_wildcard': 1, |
- 'type': 'none', |
- 'dependencies': [ |
- '../base/base.gyp:base_unittests', |
- # browser_tests's use of subprocesses chokes gcov on 10.6? |
- # Disabling for now (enabled on linux/windows below). |
- # 'browser_tests', |
- '../ipc/ipc.gyp:ipc_tests', |
- '../net/net.gyp:net_unittests', |
- '../remoting/remoting.gyp:remoting_unittests', |
- '../sql/sql.gyp:sql_unittests', |
- '../content/content_shell_and_tests.gyp:content_unittests', |
- 'unit_tests', |
- '../sync/sync.gyp:sync_unit_tests', |
- ], # 'dependencies' |
- 'conditions': [ |
- ['OS!="ios"', { |
- 'dependencies': [ |
- '../media/media.gyp:media_unittests', |
- ]}], |
- ['OS=="win"', { |
- 'dependencies': [ |
- # Courgette has not been ported from Windows. |
- # Note build/win/chrome_win.croc uniquely has the |
- # courgette source directory in an include path. |
- '../courgette/courgette.gyp:courgette_unittests', |
- 'browser_tests', |
- ]}], |
- ['OS=="linux"', { |
- 'dependencies': [ |
- # Win bot needs to be turned into an interactive bot. |
- 'interactive_ui_tests', |
- # Disabled from running in coverage_posix.py. |
- # We need to build this during compile step, so enabling here. |
- '../content/content_shell_and_tests.gyp:content_browsertests', |
- '../courgette/courgette.gyp:courgette_unittests', |
- '../crypto/crypto.gyp:crypto_unittests', |
- '../jingle/jingle.gyp:jingle_unittests', |
- '../net/net.gyp:net_perftests', |
- '../third_party/WebKit/public/all.gyp:all_blink', |
- '../url/url.gyp:url_unittests', |
- 'browser_tests', |
- 'chromedriver_unittests', |
- 'performance_ui_tests', |
- 'pyautolib', |
- 'sync_integration_tests', |
- ], |
- }], |
- ['OS=="mac"', { |
- 'dependencies': [ |
- # Placeholder; empty for now. |
- ]}], |
- ['enable_printing!=0', { |
- 'dependencies': [ |
- '../printing/printing.gyp:printing_unittests', |
- ], |
- }], |
- ], # 'conditions' |
- 'actions': [ |
- { |
- # 'message' for Linux/scons in particular. Scons |
- # requires the 'coverage' target be run from within |
- # src/chrome. |
- 'message': 'Compiling coverage bundles', |
- # MSVS must have an input file and an output file. |
- # |
- # 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 coverage_build target it |
- # necessarily means this file (chrome_tests.gypi) is changed, |
- # so the action is run (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_tests.gypi' ], |
- 'outputs': [ '<(PRODUCT_DIR)/coverage_bundles.py' ], |
- 'action_name': 'coverage_build', |
- 'action': [ 'python', '-c', |
- 'import os; ' |
- 'f = open(' \ |
- '\'<(PRODUCT_DIR)\' + os.path.sep + ' \ |
- '\'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, |
- }, |
- ], # 'actions' |
- }, |
- ### Coverage RUN. Does not compile the bundles. 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 'coverage' target. |
- { |
- 'target_name': 'coverage_run', |
- # do NOT place this in the 'all' list; most won't want it. |
- # In gyp, booleans are 0/1 not True/False. |
- 'suppress_wildcard': 1, |
- 'type': 'none', |
- 'actions': [ |
- { |
- # 'message' for Linux/scons in particular. Scons |
- # requires the 'coverage' target be run from within |
- # src/chrome. |
- 'message': 'Running the coverage script, NOT building anything', |
- # MSVS must have an input file and an output file. |
- 'inputs': [ '<(PRODUCT_DIR)/coverage_bundles.py' ], |
- 'outputs': [ '<(PRODUCT_DIR)/coverage.info' ], |
- 'action_name': 'coverage_run', |
- 'action': [ 'python', |
- '../tools/code_coverage/coverage_posix.py', |
- '--directory', |
- '<(PRODUCT_DIR)', |
- '--src_root', |
- '..', |
- '--bundles', |
- '<(PRODUCT_DIR)/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, |
- }, |
- ], # 'actions' |
- }, |
- ] |
- }], # 'coverage!=0' |
['OS == "android"', { |
'targets': [ |
{ |