summaryrefslogtreecommitdiffstats
path: root/build/all.gyp
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-08 22:52:56 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-08 22:52:56 +0000
commit2d82dcf22cddc77a40166322edab77dc33954e73 (patch)
treeaf39277a75ea30040161b4f7f9eb07bcee95eb7e /build/all.gyp
parentbbe8709f0bf10c10beebd86d85ed18cd5ff20a96 (diff)
downloadchromium_src-2d82dcf22cddc77a40166322edab77dc33954e73.zip
chromium_src-2d82dcf22cddc77a40166322edab77dc33954e73.tar.gz
chromium_src-2d82dcf22cddc77a40166322edab77dc33954e73.tar.bz2
Revert 113676 - Attempt 2 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. I reverted first attempt as it broke some browser_tests. I've straightened that out in another patch, so this should be good go again. TBR since it's the same patch as before. BUG=104360 TEST=none TBR=ben@chromium.org Review URL: http://codereview.chromium.org/8889022 TBR=sky@chromium.org Review URL: http://codereview.chromium.org/8873037 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113683 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/all.gyp')
-rw-r--r--build/all.gyp1
1 files changed, 0 insertions, 1 deletions
diff --git a/build/all.gyp b/build/all.gyp
index 6c0fd82..3480d6b 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:*',