summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorstevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-23 20:30:47 +0000
committerstevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-23 20:30:47 +0000
commite8c7581be58121cea28a4df050811da7a03e3c8f (patch)
tree4ce277b2183db8f14a2f6428a011d0589300a2b0 /build
parentcb114f14b97f51eb35991e98f4483a944ef1c323 (diff)
downloadchromium_src-e8c7581be58121cea28a4df050811da7a03e3c8f.zip
chromium_src-e8c7581be58121cea28a4df050811da7a03e3c8f.tar.gz
chromium_src-e8c7581be58121cea28a4df050811da7a03e3c8f.tar.bz2
Build & run unit tests on Aura (Rebase)
Applied patch from http://codereview.chromium.org/8665006/ BUG=none TEST=duh TBR=ben@chromium.org Review URL: http://codereview.chromium.org/8677014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111403 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/all.gyp4
1 files changed, 2 insertions, 2 deletions
diff --git a/build/all.gyp b/build/all.gyp
index fd49210..991c22f 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -606,6 +606,7 @@
'type': 'none',
'dependencies': [
'../chrome/chrome.gyp:chrome',
+ '../chrome/chrome.gyp:unit_tests',
'../ui/aura_shell/aura_shell.gyp:aura_shell_exe',
'../ui/aura_shell/aura_shell.gyp:aura_shell_unittests',
'../ui/aura/aura.gyp:*',
@@ -629,10 +630,9 @@
],
}],
['OS=="linux"', {
- # Aura unit_tests currently only work on Linux.
+ # Tests that currently only work on Linux.
'dependencies': [
'../chrome/chrome.gyp:sync_unit_tests',
- '../chrome/chrome.gyp:unit_tests',
'../content/content.gyp:content_unittests',
'../ipc/ipc.gyp:ipc_tests',
'../sql/sql.gyp:sql_unittests',