diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-07 21:35:43 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-07 21:35:43 +0000 |
| commit | b6e5a6413fb8c0a4e8ddf0cafbd61b3c2f8dbf16 (patch) | |
| tree | 091dc999bbd3c803e97b21e5e979e2cb5db7c8a0 /content/content_tests.gypi | |
| parent | 26197b3fbb55dd2e011b65434822e8ee52f2386c (diff) | |
| download | chromium_src-b6e5a6413fb8c0a4e8ddf0cafbd61b3c2f8dbf16.zip chromium_src-b6e5a6413fb8c0a4e8ddf0cafbd61b3c2f8dbf16.tar.gz chromium_src-b6e5a6413fb8c0a4e8ddf0cafbd61b3c2f8dbf16.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113470 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_tests.gypi')
| -rw-r--r-- | content/content_tests.gypi | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/content/content_tests.gypi b/content/content_tests.gypi index 60c76263..38e858d 100644 --- a/content/content_tests.gypi +++ b/content/content_tests.gypi @@ -21,7 +21,6 @@ '../third_party/webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers', '../third_party/webrtc/video_engine/video_engine.gyp:video_engine_core', '../third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine_core', - '../ui/gfx/compositor/compositor.gyp:test_compositor', '../ui/gfx/surface/surface.gyp:surface', '../ui/ui.gyp:ui_test_support', '../webkit/support/webkit_support.gyp:appcache', @@ -121,6 +120,15 @@ '../build/linux/system.gyp:glib', ], }], + ['use_webkit_compositor==1', { + 'dependencies': [ + '../ui/gfx/compositor/compositor.gyp:compositor', + ], + }, { + 'dependencies': [ + '../ui/gfx/compositor/compositor.gyp:test_compositor', + ], + }], ], }, { |