summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-07 23:56:31 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-07 23:56:31 +0000
commit973d44a198f2fa9314ecbe43b06f0a7d622dfc7e (patch)
tree4065dfa54da57bfc46f7f7fbcbd13001a31eafb6 /build
parent023caca1556db34fef0b98bb484b39c653758755 (diff)
downloadchromium_src-973d44a198f2fa9314ecbe43b06f0a7d622dfc7e.zip
chromium_src-973d44a198f2fa9314ecbe43b06f0a7d622dfc7e.tar.gz
chromium_src-973d44a198f2fa9314ecbe43b06f0a7d622dfc7e.tar.bz2
Revert 113470 - 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.
BUG=104360 TEST=none Review URL: http://codereview.chromium.org/8805033 TBR=sky@chromium.org Review URL: http://codereview.chromium.org/8873001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113507 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/all.gyp1
1 files changed, 0 insertions, 1 deletions
diff --git a/build/all.gyp b/build/all.gyp
index 47d4284..5bba86c 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -617,7 +617,6 @@
'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:*',