diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-09 16:19:03 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-09 16:19:03 +0000 |
| commit | 72f08de6e66e8be7111eedab407f80e2ae2d9ae0 (patch) | |
| tree | 4072644471f259cfecc678f8297c3ba6adf2724d /content/content_tests.gypi | |
| parent | 51d83bdfd5c71099465fba1ae1abb684db6662e3 (diff) | |
| download | chromium_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 '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', + ], + }], ], }, { |