summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build/common.croc4
-rw-r--r--chrome/chrome_tests.gypi1
2 files changed, 3 insertions, 2 deletions
diff --git a/build/common.croc b/build/common.croc
index 90b9cb9..7281bb4 100644
--- 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
index a1bde30..3f2c475 100644
--- 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):