diff options
| author | chrisha@chromium.org <chrisha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-29 21:37:17 +0000 |
|---|---|---|
| committer | chrisha@chromium.org <chrisha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-29 21:37:17 +0000 |
| commit | 06d8ca876bec682f5299fd94cc66bc16e3f239af (patch) | |
| tree | 4c7cce725332ec73cf6b1a292cc307b91ec43285 /chrome_frame | |
| parent | 243caf6856e5b1529ecded599b03dafaaaa4170f (diff) | |
| download | chromium_src-06d8ca876bec682f5299fd94cc66bc16e3f239af.zip chromium_src-06d8ca876bec682f5299fd94cc66bc16e3f239af.tar.gz chromium_src-06d8ca876bec682f5299fd94cc66bc16e3f239af.tar.bz2 | |
Rename chrome_frame coverage_bundles.py target.
chrome_frame and chrome use the same mechanism for generating a list of coverage targets. The chrome_frame targets have been prefixed with gcf_ to make them unique, but this was not done for the coverage_bundles.py target. This causes ninja to complain loudly that a target has multiple definitions.
BUG=
Review URL: https://chromiumcodereview.appspot.com/12089048
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@179422 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/chrome_frame.gyp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp index aff8337..4b9e5bd 100644 --- a/chrome_frame/chrome_frame.gyp +++ b/chrome_frame/chrome_frame.gyp @@ -985,10 +985,10 @@ # 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. + # Outputs this list of bundles into gcf_coverage_bundles.py. # # If you want to both build and run coverage from your IDE, - # use the 'coverage' target. + # use the 'gcf_coverage' target. { 'target_name': 'gcf_coverage_build', 'suppress_wildcard': 1, @@ -1021,22 +1021,22 @@ # 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 + # 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 (coverage_bundles.py is generated). + # 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)/coverage_bundles.py' ], + 'outputs': [ '<(PRODUCT_DIR)/gcf_coverage_bundles.py' ], 'action_name': 'gcf_coverage_build', 'action': [ 'python', '-c', 'import os; ' 'f = open(' \ '\'<(PRODUCT_DIR)\' + os.path.sep + ' \ - '\'coverage_bundles.py\'' \ + '\'gcf_coverage_bundles.py\'' \ ', \'w\'); ' \ 'deplist = \'' \ '<@(_dependencies)' \ @@ -1064,8 +1064,8 @@ 'actions': [ { # MSVS must have an input file and an output file. - 'inputs': [ '<(PRODUCT_DIR)/coverage_bundles.py' ], - 'outputs': [ '<(PRODUCT_DIR)/coverage.info' ], + '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', @@ -1074,7 +1074,7 @@ '--src_root', '.', '--bundles', - '<(PRODUCT_DIR)/coverage_bundles.py', + '<(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). |