summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-09 16:19:03 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-09 16:19:03 +0000
commit72f08de6e66e8be7111eedab407f80e2ae2d9ae0 (patch)
tree4072644471f259cfecc678f8297c3ba6adf2724d /build
parent51d83bdfd5c71099465fba1ae1abb684db6662e3 (diff)
downloadchromium_src-72f08de6e66e8be7111eedab407f80e2ae2d9ae0.zip
chromium_src-72f08de6e66e8be7111eedab407f80e2ae2d9ae0.tar.gz
chromium_src-72f08de6e66e8be7111eedab407f80e2ae2d9ae0.tar.bz2
Attempt 3 at:
Makes tests either use mock compositor or mock WebGraphicsContext3D depending upon which compositor we're running. This is needed to enable ui tests on the bots. Attempt 2 failed because of last minute changes to chrome_tests.gypi that I didn't merge properly with. TBRing again. BUG=104360 TEST=none TBR=ben@chromium.org Review URL: http://codereview.chromium.org/8890050 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113809 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/all.gyp1
1 files changed, 1 insertions, 0 deletions
diff --git a/build/all.gyp b/build/all.gyp
index 3480d6b..6c0fd82 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -617,6 +617,7 @@
'dependencies': [
'../chrome/chrome.gyp:chrome',
'../chrome/chrome.gyp:unit_tests',
+ '../chrome/chrome.gyp:ui_tests',
'../ui/aura_shell/aura_shell.gyp:aura_shell_exe',
'../ui/aura_shell/aura_shell.gyp:aura_shell_unittests',
'../ui/aura/aura.gyp:*',