summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/chrome_tests.gypi1
-rwxr-xr-xtools/code_coverage/coverage_posix.py5
2 files changed, 5 insertions, 1 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 7f7a969..572b089 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -4595,6 +4595,7 @@
'safe_browsing_tests',
'sync_integration_tests',
'../third_party/WebKit/Source/WebKit/chromium/WebKitUnitTests.gyp:webkit_unit_tests',
+ 'pyautolib',
]}],
['OS=="mac"', {
'dependencies': [
diff --git a/tools/code_coverage/coverage_posix.py b/tools/code_coverage/coverage_posix.py
index 682220b..4f33587 100755
--- a/tools/code_coverage/coverage_posix.py
+++ b/tools/code_coverage/coverage_posix.py
@@ -483,9 +483,12 @@ class Coverage(object):
if mo:
gtest_filter = mo.group(2)
testname = mo.group(1)
-
if ':' in testname:
testname = testname.split(':')[1]
+ # We need 'pyautolib' to run pyauto tests and 'pyautolib' itself is not an
+ # executable. So skip this test from adding into coverage_bundles.py.
+ if testname == 'pyautolib':
+ continue
self.tests += [os.path.join(self.directory, testname)]
if gtest_filter:
self.test_filters[testname] = gtest_filter