summaryrefslogtreecommitdiffstats
path: root/build/all.gyp
diff options
context:
space:
mode:
authornsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-20 03:50:13 +0000
committernsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-20 03:50:13 +0000
commitc03d48c603db6e778cf6497b18e5d05424def6c8 (patch)
tree2e661ffb66ae940ee9c1d7e8cb1ff4bc05f903fd /build/all.gyp
parentcd1236f9ac9bae4aaf746ad52c4904d2e98faa91 (diff)
downloadchromium_src-c03d48c603db6e778cf6497b18e5d05424def6c8.zip
chromium_src-c03d48c603db6e778cf6497b18e5d05424def6c8.tar.gz
chromium_src-c03d48c603db6e778cf6497b18e5d05424def6c8.tar.bz2
Build the views unittests in the builder targer. Also fix ordering.
Review URL: http://codereview.chromium.org/6347011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71918 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/all.gyp')
-rw-r--r--build/all.gyp13
1 files changed, 7 insertions, 6 deletions
diff --git a/build/all.gyp b/build/all.gyp
index 36c9216..da5e191 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -344,6 +344,12 @@
# mini_installer_tests depends on mini_installer. This should be
# defined in installer.gyp.
'../chrome/installer/mini_installer.gyp:mini_installer',
+ '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests',
+ '../chrome_frame/chrome_frame.gyp:chrome_frame_perftests',
+ '../chrome_frame/chrome_frame.gyp:chrome_frame_reliability_tests',
+ '../chrome_frame/chrome_frame.gyp:chrome_frame_tests',
+ '../chrome_frame/chrome_frame.gyp:chrome_frame_unittests',
+ '../chrome_frame/chrome_frame.gyp:npchrome_frame',
'../courgette/courgette.gyp:courgette_unittests',
'../gfx/gfx.gyp:gfx_unittests',
'../gpu/gpu.gyp:gpu_unittests',
@@ -354,18 +360,13 @@
'../remoting/remoting.gyp:remoting_unittests',
'../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
'../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:copy_TestNetscapePlugIn',
+ '../views/views.gyp:views_unittests',
# TODO(nsylvain) ui_tests.exe depends on test_shell_common.
# This should:
# 1) not be the case. OR.
# 2) be expressed in the ui tests dependencies.
'../webkit/webkit.gyp:test_shell_common',
'temp_gyp/googleurl.gyp:googleurl_unittests',
- '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests',
- '../chrome_frame/chrome_frame.gyp:chrome_frame_perftests',
- '../chrome_frame/chrome_frame.gyp:chrome_frame_reliability_tests',
- '../chrome_frame/chrome_frame.gyp:chrome_frame_tests',
- '../chrome_frame/chrome_frame.gyp:chrome_frame_unittests',
- '../chrome_frame/chrome_frame.gyp:npchrome_frame',
],
},
{