summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/chrome.gyp4
-rwxr-xr-xtools/code_coverage/coverage_posix.py15
-rwxr-xr-x[-rw-r--r--]tools/code_coverage/croc.py0
3 files changed, 7 insertions, 12 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 970f11b..09513d8 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -4778,7 +4778,9 @@
],
'actions': [
{
- # 'message' for Linux/scons in particular
+ # 'message' for Linux/scons in particular. Scons
+ # requires the 'coverage' target be run from within
+ # src/chrome.
'message': 'Running coverage_posix.py to generate coverage numbers',
'inputs': [],
'outputs': [],
diff --git a/tools/code_coverage/coverage_posix.py b/tools/code_coverage/coverage_posix.py
index 591ed33..3a122fa 100755
--- a/tools/code_coverage/coverage_posix.py
+++ b/tools/code_coverage/coverage_posix.py
@@ -138,7 +138,7 @@ class Coverage(object):
# If asked, make this REAL fast for testing.
if self.options.fast_test:
- cmdlist.append('--gtest_filter=TupleTest*')
+ cmdlist.append('--gtest_filter=RenderWidgetHost*')
retcode = subprocess.call(cmdlist)
if retcode:
@@ -149,16 +149,9 @@ class Coverage(object):
def GenerateLcov(self):
"""Convert profile data to lcov."""
- if self.IsLinux():
- command = [self.lcov,
- '--directory', self.directory,
- '--capture',
- '--output-file',
- self.coverage_info_file]
- else:
- command = [self.mcov,
- '--directory', self.directory_parent,
- '--output', self.coverage_info_file]
+ command = [self.mcov,
+ '--directory', self.directory_parent,
+ '--output', self.coverage_info_file]
print >>sys.stderr, 'Assembly command: ' + ' '.join(command)
retcode = subprocess.call(command)
if retcode:
diff --git a/tools/code_coverage/croc.py b/tools/code_coverage/croc.py
index 9d2f3ac..9d2f3ac 100644..100755
--- a/tools/code_coverage/croc.py
+++ b/tools/code_coverage/croc.py