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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome_tests.gypi

Issue 8036044: Add (not yet working) content_browsertests target. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/all.gyp ('k') | chrome/test/base/chrome_test_launcher.cc » ('j') | chrome/test/base/chrome_test_launcher.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_tests.gypi
===================================================================
--- chrome/chrome_tests.gypi (revision 103163)
+++ chrome/chrome_tests.gypi (working copy)
@@ -473,7 +473,10 @@
'include_dirs': [
'..',
],
- 'defines': [ 'HAS_OUT_OF_PROC_TEST_RUNNER' ],
+ 'defines': [
+ 'HAS_OUT_OF_PROC_TEST_RUNNER',
+ 'BROWSER_TESTS_HEADER_OVERRIDE="chrome/test/base/in_process_browser_test.h"',
+ ],
'sources': [
'browser/accessibility/accessibility_mac_uitest.mm',
'browser/autofill/autofill_browsertest.cc',
@@ -497,9 +500,11 @@
'browser/ui/views/ssl_client_certificate_selector_browsertest.cc',
'browser/ui/views/tabs/tab_dragging_test.cc',
'browser/ui/webui/workers_ui_browsertest.cc',
- 'test/base/out_of_proc_test_runner.cc',
+ 'test/base/chrome_test_launcher.cc',
'test/base/view_event_test_base.cc',
'test/base/view_event_test_base.h',
+ '../content/test/test_launcher.cc',
+ '../content/test/test_launcher.h',
],
'conditions': [
['toolkit_uses_gtk == 1', {
@@ -2177,7 +2182,10 @@
'include_dirs': [
'..',
],
- 'defines': [ 'HAS_OUT_OF_PROC_TEST_RUNNER' ],
+ 'defines': [
+ 'HAS_OUT_OF_PROC_TEST_RUNNER',
+ 'BROWSER_TESTS_HEADER_OVERRIDE="chrome/test/base/in_process_browser_test.h"',
+ ],
'sources': [
'app/breakpad_mac_stubs.mm',
'app/chrome_command_ids.h',
@@ -2436,7 +2444,7 @@
'test/base/in_process_browser_test_browsertest.cc',
'test/base/render_view_test.cc',
'test/base/render_view_test.h',
- 'test/base/out_of_proc_test_runner.cc',
+ 'test/base/chrome_test_launcher.cc',
'test/data/webui/assertions.js',
'test/data/webui/async_gen-inl.h',
'test/data/webui/async_gen.js',
@@ -2466,6 +2474,8 @@
'../content/renderer/render_widget_browsertest.cc',
'../content/renderer/render_widget_browsertest.h',
'../content/renderer/v8_value_converter_browsertest.cc',
+ '../content/test/test_launcher.cc',
+ '../content/test/test_launcher.h',
],
'conditions': [
['chromeos==0', {
@@ -2706,11 +2716,16 @@
'include_dirs': [
'..',
],
- 'defines': [ 'HAS_OUT_OF_PROC_TEST_RUNNER' ],
+ 'defines': [
+ 'HAS_OUT_OF_PROC_TEST_RUNNER',
+ 'BROWSER_TESTS_HEADER_OVERRIDE="chrome/test/base/in_process_browser_test.h"',
+ ],
'sources': [
'app/chrome_dll.rc',
'browser/safe_browsing/safe_browsing_test.cc',
- 'test/base/out_of_proc_test_runner.cc',
+ 'test/base/chrome_test_launcher.cc',
+ '../content/test/test_launcher.cc',
+ '../content/test/test_launcher.h',
],
'conditions': [
['safe_browsing==0', {
@@ -3094,7 +3109,10 @@
'<(protoc_out_dir)',
],
# TODO(phajdan.jr): Only temporary, to make transition easier.
- 'defines': [ 'HAS_OUT_OF_PROC_TEST_RUNNER' ],
+ 'defines': [
+ 'HAS_OUT_OF_PROC_TEST_RUNNER',
+ 'BROWSER_TESTS_HEADER_OVERRIDE="chrome/test/base/in_process_browser_test.h"',
+ ],
'sources': [
'app/chrome_command_ids.h',
'app/chrome_dll.rc',
@@ -3103,7 +3121,7 @@
'browser/password_manager/password_form_data.cc',
'browser/sessions/session_backend.cc',
'browser/sync/glue/session_model_associator.cc',
- 'test/base/out_of_proc_test_runner.cc',
+ 'test/base/chrome_test_launcher.cc',
'test/data/resource.rc',
'browser/sync/test/integration/apps_helper.cc',
'browser/sync/test/integration/apps_helper.h',
@@ -3160,6 +3178,8 @@
'browser/sync/test/integration/two_client_typed_urls_sync_test.cc',
'browser/sync/test/integration/typed_urls_helper.cc',
'browser/sync/test/integration/typed_urls_helper.h',
+ '../content/test/test_launcher.cc',
+ '../content/test/test_launcher.h',
],
'conditions': [
['toolkit_uses_gtk == 1', {
@@ -3242,7 +3262,10 @@
'<(INTERMEDIATE_DIR)',
'<(protoc_out_dir)',
],
- 'defines': [ 'HAS_OUT_OF_PROC_TEST_RUNNER' ],
+ 'defines': [
+ 'HAS_OUT_OF_PROC_TEST_RUNNER',
+ 'BROWSER_TESTS_HEADER_OVERRIDE="chrome/test/base/in_process_browser_test.h"',
+ ],
'sources': [
'app/chrome_command_ids.h',
'app/chrome_dll.rc',
@@ -3277,8 +3300,10 @@
'browser/sync/test/integration/sync_test.h',
'browser/sync/test/integration/typed_urls_helper.cc',
'browser/sync/test/integration/typed_urls_helper.h',
- 'test/base/out_of_proc_test_runner.cc',
+ 'test/base/chrome_test_launcher.cc',
'test/data/resource.rc',
+ '../content/test/test_launcher.cc',
+ '../content/test/test_launcher.h',
],
'conditions': [
['toolkit_uses_gtk == 1', {
@@ -3374,12 +3399,17 @@
'..',
'<(test_list_out_dir)',
],
- 'defines': [ 'HAS_OUT_OF_PROC_TEST_RUNNER' ],
+ 'defines': [
+ 'HAS_OUT_OF_PROC_TEST_RUNNER',
+ 'BROWSER_TESTS_HEADER_OVERRIDE="chrome/test/base/in_process_browser_test.h"',
+ ],
'sources': [
'browser/gpu_pixel_browsertest.cc',
'browser/gpu_crash_browsertest.cc',
- 'test/base/out_of_proc_test_runner.cc',
+ 'test/base/chrome_test_launcher.cc',
'test/gpu/webgl_conformance_tests.cc',
+ '../content/test/test_launcher.cc',
+ '../content/test/test_launcher.h',
'<(test_list_out_dir)/webgl_conformance_test_list_autogen.h',
],
# hard_dependency is necessary for this target because it has actions
« no previous file with comments | « build/all.gyp ('k') | chrome/test/base/chrome_test_launcher.cc » ('j') | chrome/test/base/chrome_test_launcher.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698