summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/chrome_tests.gypi2
-rwxr-xr-xtools/code_coverage/coverage_posix.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index aa6a500..44f9331 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -2420,7 +2420,7 @@
# src/chrome.
'message': 'Compiling coverage bundles.',
# MSVS must have an input file and an output file.
- 'inputs': [ '../tools/code_coverage/coverage_posix.py' ],
+ 'inputs': [ '<@(_dependencies)' ],
'outputs': [ '<(PRODUCT_DIR)/coverage_bundles.py' ],
'action_name': 'coverage_build',
'action': [ 'python', '-c',
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__'):