summaryrefslogtreecommitdiffstats
path: root/tools/code_coverage
diff options
context:
space:
mode:
authorjrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-26 03:14:02 +0000
committerjrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-26 03:14:02 +0000
commit1952ead62fe3413ce990e8b0d3440b8f49a68922 (patch)
tree3ae3dc5ddd84760493bd2ab1a91c66efdbcacab7 /tools/code_coverage
parent65c532e095c830e0d73cf567be809fd6a09e53df (diff)
downloadchromium_src-1952ead62fe3413ce990e8b0d3440b8f49a68922.zip
chromium_src-1952ead62fe3413ce990e8b0d3440b8f49a68922.tar.gz
chromium_src-1952ead62fe3413ce990e8b0d3440b8f49a68922.tar.bz2
chrome_tests.gypi: give better deps to make sure coverage_bundles.py generated more appropriately.
coverage_posix.py: Properly catch syntax errors on eval'd files. Review URL: http://codereview.chromium.org/2259001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48246 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/code_coverage')
-rwxr-xr-xtools/code_coverage/coverage_posix.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/code_coverage/coverage_posix.py b/tools/code_coverage/coverage_posix.py
index 47cd524..ebc7df5 100755
--- a/tools/code_coverage/coverage_posix.py
+++ b/tools/code_coverage/coverage_posix.py
@@ -376,7 +376,7 @@ class Coverage(object):
except IOError:
logging.fatal('IO error in bundle file ' +
self.options.bundles + ' (doesn\'t exist?)')
- except NameError, SyntaxError:
+ except (NameError, SyntaxError):
logging.fatal('Parse or syntax error in bundle file ' +
self.options.bundles)
if hasattr(tests_from_bundles, '__iter__'):