Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(54)

Side by Side Diff: content/content_tests.gypi

Issue 11144012: [content shell] Update dependencies for content shell layout tests from DumpRenderTree to TestRunner (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/content_shell.gypi ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'test_support_content', 8 'target_name': 'test_support_content',
9 'type': 'static_library', 9 'type': 'static_library',
10 'defines!': ['CONTENT_IMPLEMENTATION'], 10 'defines!': ['CONTENT_IMPLEMENTATION'],
(...skipping 609 matching lines...) Expand 10 before | Expand all | Expand 10 after
620 '../ppapi/ppapi_internal.gyp:ppapi_ipc', 620 '../ppapi/ppapi_internal.gyp:ppapi_ipc',
621 '../ppapi/ppapi_internal.gyp:ppapi_shared', 621 '../ppapi/ppapi_internal.gyp:ppapi_shared',
622 '../ppapi/ppapi_internal.gyp:ppapi_unittest_shared', 622 '../ppapi/ppapi_internal.gyp:ppapi_unittest_shared',
623 '../skia/skia.gyp:skia', 623 '../skia/skia.gyp:skia',
624 '../testing/gmock.gyp:gmock', 624 '../testing/gmock.gyp:gmock',
625 '../testing/gtest.gyp:gtest', 625 '../testing/gtest.gyp:gtest',
626 '../third_party/mesa/mesa.gyp:osmesa', 626 '../third_party/mesa/mesa.gyp:osmesa',
627 '../ui/ui.gyp:ui', 627 '../ui/ui.gyp:ui',
628 '../webkit/support/webkit_support.gyp:clearkeycdmplugin', 628 '../webkit/support/webkit_support.gyp:clearkeycdmplugin',
629 '../webkit/support/webkit_support.gyp:glue', 629 '../webkit/support/webkit_support.gyp:glue',
630 # TODO(jochen): Change this to DumpRenderTree_helpers once 630 '<(webkit_src_dir)/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRende rTree.gyp:TestRunner_resources',
631 # http://wkb.ug/99023 has landed.
632 '<(webkit_src_dir)/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRende rTree.gyp:DumpRenderTree',
633 ], 631 ],
634 'include_dirs': [ 632 'include_dirs': [
635 '..', 633 '..',
636 ], 634 ],
637 'includes': [ 635 'includes': [
638 'browser/gpu/test_support_gpu.gypi', 636 'browser/gpu/test_support_gpu.gypi',
639 ], 637 ],
640 'defines': [ 638 'defines': [
641 'HAS_OUT_OF_PROC_TEST_RUNNER', 639 'HAS_OUT_OF_PROC_TEST_RUNNER',
642 ], 640 ],
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
916 'java_in_dir': '../content/shell/android/javatests', 914 'java_in_dir': '../content/shell/android/javatests',
917 'resource_dir': '../res', 915 'resource_dir': '../res',
918 'additional_src_dirs': ['../content/public/android/javatests/'], 916 'additional_src_dirs': ['../content/public/android/javatests/'],
919 }, 917 },
920 'includes': [ '../build/java_apk.gypi' ], 918 'includes': [ '../build/java_apk.gypi' ],
921 }, 919 },
922 ], 920 ],
923 }], 921 }],
924 ], 922 ],
925 } 923 }
OLDNEW
« no previous file with comments | « content/content_shell.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698