chromium/src
0
Fork 0
Code Activity

[content shell] Update dependencies for content shell layout tests from DumpRenderTree to TestRunner_resources

Browse Source 
Also add an explicit dependency from content_shell to osmesa

BUG=111316
TEST=content_shell --dump-render-tree still works after a clobber build

Review URL: https://codereview.chromium.org/11144012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161832 0039d316-1c4b-4281-b951-d872f2087c98
This commit is contained in:
jochen@chromium.org
2012-10-15 07:45:42 +00:00
parent d93d68b11d
commit bb5d2d90e1
2 changed files with 3 additions and 4 deletions

3
content/content_shell.gypi

@ -305,6 +305,8 @@
'dependencies': [
'content_shell_lib',
'content_shell_pak',
'../third_party/mesa/mesa.gyp:osmesa',
'<(webkit_src_dir)/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:TestRunner_resources',
],
'include_dirs': [
'..',
@ -436,7 +438,6 @@
'type': 'none',
'dependencies': [
'content_shell',
'<(webkit_src_dir)/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:DumpRenderTree',
],
},
],

4
content/content_tests.gypi

@ -627,9 +627,7 @@
'../ui/ui.gyp:ui',
'../webkit/support/webkit_support.gyp:clearkeycdmplugin',
'../webkit/support/webkit_support.gyp:glue',
# TODO(jochen): Change this to DumpRenderTree_helpers once
# http://wkb.ug/99023 has landed.
'<(webkit_src_dir)/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:DumpRenderTree',
'<(webkit_src_dir)/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:TestRunner_resources',
],
'include_dirs': [
'..',