Various fixes for coverage building and testing.

Review URL: http://codereview.chromium.org/8588048 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111801 0039d316-1c4b-4281-b951-d872f2087c98
hylschwy · Nov 28, 2011 · 13f5a41 · 13f5a41
1 parent ae7f1ba
commit 13f5a41
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/build/common.croc b/build/common.croc
@@ -30,7 +30,7 @@
       'group' : 'source',
     },
     {
-      'regexp' : '.*_(test|unittest)\\.',
+      'regexp' : '.*_(test|unittest|uitest|browsertest)\\.',
       'group' : 'test',
     },
 
@@ -47,7 +47,7 @@
     # Files/paths to include.  Specify these before the excludes, since rules
     # are in order.
     {
-      'regexp' : '^CHROMIUM/(base|media|net|printing|remoting|chrome|webkit/glue|native_client)/',
+      'regexp' : '^CHROMIUM/(base|media|net|printing|remoting|chrome|content|webkit/glue|native_client)/',
       'include' : 1,
     },
     # Don't include subversion or mercurial SCM dirs

diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
@@ -4213,6 +4213,7 @@
             '../printing/printing.gyp:printing_unittests',
             '../remoting/remoting.gyp:remoting_unittests',
             '../sql/sql.gyp:sql_unittests',
+            '../content/content.gyp:content_unittests',
             # ui_tests seem unhappy on both Mac and Win when run under
             # coverage (all tests fail, often with a
             # "server_->WaitForInitialLoads()").  TODO(jrg):