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

Side by Side Diff: content/content_tests.gypi

Issue 10803026: Get content_browsertest working. I've added a simple test for now, and will convert the tests in sr… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: get it working on mac + linux, fix unittests crash, and fix unittest link error and add missing dep… Created 8 years, 5 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 | « chrome/test/perf/rendering/throughput_tests.cc ('k') | content/public/test/browser_test.h » ('j') | 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'],
11 'dependencies': [ 11 'dependencies': [
12 '../build/temp_gyp/googleurl.gyp:googleurl', 12 '../build/temp_gyp/googleurl.gyp:googleurl',
13 'content_app', 13 'content_app',
14 'content_browser', 14 'content_browser',
15 'content_common', 15 'content_common',
16 '../skia/skia.gyp:skia', 16 '../skia/skia.gyp:skia',
17 '../testing/gmock.gyp:gmock', 17 '../testing/gmock.gyp:gmock',
18 '../testing/gtest.gyp:gtest', 18 '../testing/gtest.gyp:gtest',
19 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', 19 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
20 '../ui/surface/surface.gyp:surface', 20 '../ui/surface/surface.gyp:surface',
21 '../ui/ui.gyp:ui_test_support', 21 '../ui/ui.gyp:ui_test_support',
22 '../webkit/support/webkit_support.gyp:appcache', 22 '../webkit/support/webkit_support.gyp:appcache',
23 ], 23 ],
24 'include_dirs': [ 24 'include_dirs': [
25 '..', 25 '..',
26 ], 26 ],
27 'sources': [ 27 'sources': [
28 'public/test/accessibility_test_utils_win.h', 28 'public/test/accessibility_test_utils_win.h',
29 'public/test/browser_test.h', 29 'public/test/browser_test.h',
30 'public/test/browser_test_utils.h',
30 'public/test/content_test_suite_base.h', 31 'public/test/content_test_suite_base.h',
31 'public/test/js_injection_ready_observer.h', 32 'public/test/js_injection_ready_observer.h',
32 'public/test/mock_download_item.h', 33 'public/test/mock_download_item.h',
33 'public/test/mock_download_manager.h', 34 'public/test/mock_download_manager.h',
34 'public/test/mock_notification_observer.h', 35 'public/test/mock_notification_observer.h',
35 'public/test/mock_render_process_host.h', 36 'public/test/mock_render_process_host.h',
36 'public/test/mock_render_thread.h', 37 'public/test/mock_render_thread.h',
37 'public/test/mock_resource_context.h', 38 'public/test/mock_resource_context.h',
38 'public/test/render_view_fake_resources_test.h', 39 'public/test/render_view_fake_resources_test.h',
39 'public/test/render_view_test.h', 40 'public/test/render_view_test.h',
(...skipping 27 matching lines...) Expand all
67 'browser/renderer_host/test_render_view_host.h', 68 'browser/renderer_host/test_render_view_host.h',
68 'browser/web_contents/test_web_contents.cc', 69 'browser/web_contents/test_web_contents.cc',
69 'browser/web_contents/test_web_contents.h', 70 'browser/web_contents/test_web_contents.h',
70 'common/test_url_constants.cc', 71 'common/test_url_constants.cc',
71 'common/test_url_constants.h', 72 'common/test_url_constants.h',
72 'gpu/gpu_idirect3d9_mock_win.cc', 73 'gpu/gpu_idirect3d9_mock_win.cc',
73 'gpu/gpu_idirect3d9_mock_win.h', 74 'gpu/gpu_idirect3d9_mock_win.h',
74 'test/accessibility_test_utils_win.cc', 75 'test/accessibility_test_utils_win.cc',
75 'test/browser_test_base.cc', 76 'test/browser_test_base.cc',
76 'test/browser_test_base.h', 77 'test/browser_test_base.h',
78 'test/browser_test_utils.cc',
77 'test/content_test_suite.cc', 79 'test/content_test_suite.cc',
78 'test/content_test_suite.h', 80 'test/content_test_suite.h',
79 'test/content_test_suite_base.cc', 81 'test/content_test_suite_base.cc',
80 'test/gpu/gpu_test_config.cc', 82 'test/gpu/gpu_test_config.cc',
81 'test/gpu/gpu_test_config.h', 83 'test/gpu/gpu_test_config.h',
82 'test/gpu/gpu_test_expectations_parser.cc', 84 'test/gpu/gpu_test_expectations_parser.cc',
83 'test/gpu/gpu_test_expectations_parser.h', 85 'test/gpu/gpu_test_expectations_parser.h',
84 'test/mock_download_item.cc', 86 'test/mock_download_item.cc',
85 'test/mock_download_manager.cc', 87 'test/mock_download_manager.cc',
86 'test/mock_keyboard.cc', 88 'test/mock_keyboard.cc',
(...skipping 427 matching lines...) Expand 10 before | Expand all | Expand 10 after
514 }, 516 },
515 { 517 {
516 'target_name': 'content_browsertests', 518 'target_name': 'content_browsertests',
517 'type': 'executable', 519 'type': 'executable',
518 'defines!': ['CONTENT_IMPLEMENTATION'], 520 'defines!': ['CONTENT_IMPLEMENTATION'],
519 'dependencies': [ 521 'dependencies': [
520 'content_gpu', 522 'content_gpu',
521 'content_plugin', 523 'content_plugin',
522 'content_renderer', 524 'content_renderer',
523 'content_shell_lib', 525 'content_shell_lib',
526 'content_shell_pak',
524 'test_support_content', 527 'test_support_content',
525 '../base/base.gyp:test_support_base', 528 '../base/base.gyp:test_support_base',
526 '../ipc/ipc.gyp:test_support_ipc', 529 '../ipc/ipc.gyp:test_support_ipc',
527 '../net/net.gyp:net_test_support', 530 '../net/net.gyp:net_test_support',
528 '../ppapi/ppapi_internal.gyp:ppapi_host', 531 '../ppapi/ppapi_internal.gyp:ppapi_host',
529 '../ppapi/ppapi_internal.gyp:ppapi_proxy', 532 '../ppapi/ppapi_internal.gyp:ppapi_proxy',
530 '../ppapi/ppapi_internal.gyp:ppapi_shared', 533 '../ppapi/ppapi_internal.gyp:ppapi_shared',
531 '../ppapi/ppapi_internal.gyp:ppapi_unittest_shared', 534 '../ppapi/ppapi_internal.gyp:ppapi_unittest_shared',
532 '../skia/skia.gyp:skia', 535 '../skia/skia.gyp:skia',
533 '../testing/gtest.gyp:gtest', 536 '../testing/gtest.gyp:gtest',
534 '../ui/ui.gyp:ui', 537 '../ui/ui.gyp:ui',
535 '../webkit/support/webkit_support.gyp:glue', 538 '../webkit/support/webkit_support.gyp:glue',
536 ], 539 ],
537 'include_dirs': [ 540 'include_dirs': [
538 '..', 541 '..',
539 ], 542 ],
540 'defines': [ 543 'defines': [
541 'HAS_OUT_OF_PROC_TEST_RUNNER', 544 'HAS_OUT_OF_PROC_TEST_RUNNER',
542 ], 545 ],
543 'sources': [ 546 'sources': [
544 'test/content_browser_test.h', 547 'test/content_browser_test.h',
545 'test/content_browser_test.cc', 548 'test/content_browser_test.cc',
549 'test/content_browser_test_utils.cc',
550 'test/content_browser_test_utils.h',
551 'test/content_browser_test_test.cc',
546 'test/content_test_launcher.cc', 552 'test/content_test_launcher.cc',
547 'renderer/pepper/pepper_file_chooser_host_browsertest.cc',
548 ], 553 ],
549 'conditions': [ 554 'conditions': [
550 ['OS=="win"', { 555 ['OS=="win"', {
551 'resource_include_dirs': [ 556 'resource_include_dirs': [
552 '<(SHARED_INTERMEDIATE_DIR)/webkit', 557 '<(SHARED_INTERMEDIATE_DIR)/webkit',
553 ], 558 ],
554 'sources': [ 559 'sources': [
555 'shell/resource.h', 560 'shell/resource.h',
556 'shell/shell.rc', 561 'shell/shell.rc',
557 # TODO: It would be nice to have these pulled in 562 # TODO: It would be nice to have these pulled in
(...skipping 19 matching lines...) Expand all
577 }, 582 },
578 }, 583 },
579 }, 584 },
580 }, 585 },
581 }], 586 }],
582 ['OS=="win" and win_use_allocator_shim==1', { 587 ['OS=="win" and win_use_allocator_shim==1', {
583 'dependencies': [ 588 'dependencies': [
584 '../base/allocator/allocator.gyp:allocator', 589 '../base/allocator/allocator.gyp:allocator',
585 ], 590 ],
586 }], 591 }],
592 ['OS=="mac"', {
593 'dependencies': [
594 'content_shell', # Needed for Content Shell.app's Helper.
595 ],
596 }],
587 ], 597 ],
588 }, 598 },
589 ], 599 ],
590 'conditions': [ 600 'conditions': [
591 ['chromeos==1 or OS=="linux" or OS=="win" or OS=="mac"', { 601 ['chromeos==1 or OS=="linux" or OS=="win" or OS=="mac"', {
592 'targets': [ 602 'targets': [
593 { 603 {
594 'target_name': 'video_decode_accelerator_unittest', 604 'target_name': 'video_decode_accelerator_unittest',
595 'type': 'executable', 605 'type': 'executable',
596 'dependencies': [ 606 'dependencies': [
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
683 '<(PRODUCT_DIR)/lib.java/chromium_base.jar', 693 '<(PRODUCT_DIR)/lib.java/chromium_base.jar',
684 '<(PRODUCT_DIR)/lib.java/chromium_content.jar', 694 '<(PRODUCT_DIR)/lib.java/chromium_content.jar',
685 ], 695 ],
686 }, 696 },
687 'includes': [ '../build/apk_test.gypi' ], 697 'includes': [ '../build/apk_test.gypi' ],
688 }, 698 },
689 ], 699 ],
690 }], 700 }],
691 ], 701 ],
692 } 702 }
OLDNEW
« no previous file with comments | « chrome/test/perf/rendering/throughput_tests.cc ('k') | content/public/test/browser_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698