diff options
| -rw-r--r-- | build/all.gyp | 3 | ||||
| -rwxr-xr-x | chrome/chrome.gyp | 268 |
2 files changed, 268 insertions, 3 deletions
diff --git a/build/all.gyp b/build/all.gyp index d78b362..7fbd745 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -12,7 +12,6 @@ '../app/app.gyp:*', '../base/base.gyp:*', '../chrome/chrome.gyp:*', - '../chrome/test/interactive_ui/interactive_ui_test.gyp:*', '../ipc/ipc.gyp:*', '../media/media.gyp:*', '../net/net.gyp:*', @@ -159,6 +158,7 @@ 'dependencies': [ '../app/app.gyp:app_unittests', '../chrome/chrome.gyp:browser_tests', + '../chrome/chrome.gyp:interactive_ui_tests', '../chrome/chrome.gyp:memory_test', '../chrome/chrome.gyp:page_cycler_tests', '../chrome/chrome.gyp:plugin_tests', @@ -173,7 +173,6 @@ # mini_installer_tests depends on mini_installer. This should be # defined in installer.gyp. '../chrome/installer/mini_installer.gyp:mini_installer', - '../chrome/test/interactive_ui/interactive_ui_test.gyp:interactive_ui_tests', '../courgette/courgette.gyp:courgette_unittests', '../ipc/ipc.gyp:ipc_tests', '../media/media.gyp:media_unittests', diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index ff96123..a06ebb7 100755 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -5526,6 +5526,139 @@ }], ], }, + # TODO: enable on mac. + { + 'target_name': 'interactive_ui_tests', + 'type': 'executable', + 'msvs_guid': '018D4F38-6272-448F-A864-976DA09F05D0', + 'dependencies': [ + 'chrome', + 'chrome_resources', + 'chrome_strings', + 'debugger', + 'test_support_common', + 'test_support_ui', + 'syncapi', + '../third_party/hunspell/hunspell.gyp:hunspell', + '../net/net.gyp:net_resources', + '../skia/skia.gyp:skia', + '../third_party/icu/icu.gyp:icui18n', + '../third_party/libpng/libpng.gyp:libpng', + '../third_party/libxml/libxml.gyp:libxml', + '../third_party/zlib/zlib.gyp:zlib', + '../testing/gtest.gyp:gtest', + '../third_party/npapi/npapi.gyp:npapi', + # run time dependency + '../webkit/webkit.gyp:webkit_resources', + ], + 'include_dirs': [ + '..', + ], + # TODO(phajdan.jr): Only temporary, to make transition easier. + 'defines': [ 'ALLOW_IN_PROC_BROWSER_TEST' ], + 'sources': [ + 'browser/autocomplete/autocomplete_edit_view_browsertest.cc', + 'browser/browser_focus_uitest.cc', + 'browser/debugger/devtools_sanity_unittest.cc', + 'browser/views/bookmark_bar_view_test.cc', + 'browser/blocked_popup_container_interactive_uitest.cc', + 'browser/views/find_bar_host_interactive_uitest.cc', + 'browser/views/tabs/tab_dragging_test.cc', + 'test/in_process_browser_test.cc', + 'test/in_process_browser_test.h', + 'test/interactive_ui/npapi_interactive_test.cc', + 'test/interactive_ui/view_event_test_base.cc', + 'test/interactive_ui/view_event_test_base.h', + ], + 'conditions': [ + ['OS=="linux"', { + 'dependencies': [ + '../build/linux/system.gyp:gtk', + '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', + ], + 'sources!': [ + # TODO(port) + 'browser/views/bookmark_bar_view_test.cc', + 'browser/views/find_bar_host_interactive_uitest.cc', + 'browser/views/tabs/tab_dragging_test.cc', + 'test/interactive_ui/npapi_interactive_test.cc', + 'test/interactive_ui/view_event_test_base.cc', + 'test/interactive_ui/view_event_test_base.h', + ], + }], + ['target_arch!="x64"', { + 'dependencies': [ + # run time dependency + '../webkit/tools/test_shell/test_shell.gyp:npapi_test_plugin', + ], + }], + ['OS=="linux" and toolkit_views==1', { + 'dependencies': [ + '../views/views.gyp:views', + ], + }], + ['OS=="mac"', { + 'sources!': [ + # TODO(port) + 'browser/autocomplete/autocomplete_edit_view_browsertest.cc', + 'browser/browser_focus_uitest.cc', + 'browser/debugger/devtools_sanity_unittest.cc', + 'browser/views/bookmark_bar_view_test.cc', + 'browser/blocked_popup_container_interactive_uitest.cc', + 'browser/views/find_bar_host_interactive_uitest.cc', + 'browser/views/tabs/tab_dragging_test.cc', + 'test/interactive_ui/npapi_interactive_test.cc', + 'test/interactive_ui/view_event_test_base.cc', + 'test/interactive_ui/view_event_test_base.h', + ], + }], + ['OS=="win"', { + 'include_dirs': [ + 'third_party/wtl/include', + ], + 'dependencies': [ + 'chrome_dll_version', + 'crash_service', # run time dependency + 'installer/installer.gyp:installer_util_strings', + '../views/views.gyp:views', + '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc', + ], + 'sources': [ + '../webkit/glue/resources/aliasb.cur', + '../webkit/glue/resources/cell.cur', + '../webkit/glue/resources/col_resize.cur', + '../webkit/glue/resources/copy.cur', + '../webkit/glue/resources/row_resize.cur', + '../webkit/glue/resources/vertical_text.cur', + '../webkit/glue/resources/zoom_in.cur', + '../webkit/glue/resources/zoom_out.cur', + + 'app/chrome_dll.rc', + 'test/data/resource.rc', + + # TODO: It would be nice to have these pulled in + # automatically from direct_dependent_settings in + # their various targets (net.gyp:net_resources, etc.), + # but that causes errors in other targets when + # resulting .res files get referenced multiple times. + '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', + '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', + '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', + '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', + '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', + ], + 'configurations': { + 'Debug': { + 'msvs_settings': { + 'VCLinkerTool': { + 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', + }, + }, + }, + }, + }], + ], + }, # TODO(port): enable on mac. { 'target_name': 'reliability_tests', @@ -5702,7 +5835,6 @@ 'installer/installer.gyp:*', '../app/app.gyp:*', '../base/base.gyp:*', - 'test/interactive_ui/interactive_ui_test.gyp:*', '../ipc/ipc.gyp:*', '../media/media.gyp:*', '../net/net.gyp:*', @@ -5929,6 +6061,140 @@ ], }, { + 'target_name': 'interactive_ui_tests_dll', + # 'product_name': 'interactive_ui_tests', + 'type': 'shared_library', + 'msvs_guid': '04116FAF-DA17-46EE-B108-971FCF0F0AFC', + 'dependencies': [ + 'chrome', + 'chrome_resources', + 'chrome_strings', + 'debugger', + 'test_support_common', + 'test_support_ui', + 'syncapi', + '../third_party/hunspell/hunspell.gyp:hunspell', + '../net/net.gyp:net_resources', + '../skia/skia.gyp:skia', + '../third_party/icu/icu.gyp:icui18n', + '../third_party/libpng/libpng.gyp:libpng', + '../third_party/libxml/libxml.gyp:libxml', + '../third_party/zlib/zlib.gyp:zlib', + '../testing/gtest.gyp:gtest', + '../third_party/npapi/npapi.gyp:npapi', + # run time dependency + '../webkit/webkit.gyp:webkit_resources', + ], + 'include_dirs': [ + '..', + ], + 'defines': [ 'ALLOW_IN_PROC_BROWSER_TEST' ], + 'sources': [ + 'browser/autocomplete/autocomplete_edit_view_browsertest.cc', + 'browser/browser_focus_uitest.cc', + 'browser/debugger/devtools_sanity_unittest.cc', + 'browser/views/bookmark_bar_view_test.cc', + 'browser/blocked_popup_container_interactive_uitest.cc', + 'browser/views/find_bar_host_interactive_uitest.cc', + 'browser/views/tabs/tab_dragging_test.cc', + 'test/in_process_browser_test.cc', + 'test/in_process_browser_test.h', + 'test/interactive_ui/npapi_interactive_test.cc', + 'test/interactive_ui/view_event_test_base.cc', + 'test/interactive_ui/view_event_test_base.h', + 'test/test_launcher/run_all_unittests.cc', + 'test/test_launcher/test_runner.h', + 'test/test_launcher/test_runner.cc', + 'test/unit/chrome_test_suite.h', + ], + 'conditions': [ + ['OS=="linux"', { + 'dependencies': [ + '../build/linux/system.gyp:gtk', + ], + 'sources!': [ + # TODO(port) + 'browser/views/bookmark_bar_view_test.cc', + 'browser/views/find_bar_host_interactive_uitest.cc', + 'browser/views/tabs/tab_dragging_test.cc', + 'test/interactive_ui/npapi_interactive_test.cc', + 'test/interactive_ui/view_event_test_base.cc', + 'test/interactive_ui/view_event_test_base.h', + ], + }], + ['target_arch!="x64"', { + 'dependencies': [ + # run time dependency + '../webkit/tools/test_shell/test_shell.gyp:npapi_test_plugin', + ], + }], + ['OS=="linux" and toolkit_views==1', { + 'dependencies': [ + '../views/views.gyp:views', + ], + }], + ['OS=="mac"', { + 'sources!': [ + # TODO(port) + 'browser/autocomplete/autocomplete_edit_view_browsertest.cc', + 'browser/browser_focus_uitest.cc', + 'browser/debugger/devtools_sanity_unittest.cc', + 'browser/views/bookmark_bar_view_test.cc', + 'browser/blocked_popup_container_interactive_uitest.cc', + 'browser/views/find_bar_host_interactive_uitest.cc', + 'browser/views/tabs/tab_dragging_test.cc', + 'test/interactive_ui/npapi_interactive_test.cc', + 'test/interactive_ui/view_event_test_base.cc', + 'test/interactive_ui/view_event_test_base.h', + ], + }], + ['OS=="win"', { + 'include_dirs': [ + 'third_party/wtl/include', + ], + 'dependencies': [ + 'chrome_dll_version', + 'crash_service', # run time dependency + 'installer/installer.gyp:installer_util_strings', + '../views/views.gyp:views', + ], + 'sources': [ + '../webkit/glue/resources/aliasb.cur', + '../webkit/glue/resources/cell.cur', + '../webkit/glue/resources/col_resize.cur', + '../webkit/glue/resources/copy.cur', + '../webkit/glue/resources/row_resize.cur', + '../webkit/glue/resources/vertical_text.cur', + '../webkit/glue/resources/zoom_in.cur', + '../webkit/glue/resources/zoom_out.cur', + + 'app/chrome_dll.rc', + 'test/data/resource.rc', + + # TODO: It would be nice to have these pulled in + # automatically from direct_dependent_settings in + # their various targets (net.gyp:net_resources, etc.), + # but that causes errors in other targets when + # resulting .res files get referenced multiple times. + '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', + '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', + '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', + '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', + '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', + ], + 'configurations': { + 'Debug': { + 'msvs_settings': { + 'VCLinkerTool': { + 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', + }, + }, + }, + }, + }], + ], + }, + { # Shared library used by the in-proc browser tests. 'target_name': 'browser_tests_dll', 'type': 'shared_library', |