Commit 43b24b69 authored by sgk@google.com's avatar sgk@google.com

chrome.gyp updates:

* remove chrome\browser\views\find_bar_win_unittest.cc
* add Windows-only test targets:
  ** interactive_ui_tests
  ** plugin_tests
  ** selenium_tests
* Move from unit_tests to test_support_common:
  ** test/in_process_browser_test.{cc,h}
  ** test/ui_test_utils.{cc,h}


Review URL: http://codereview.chromium.org/100168

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15045 0039d316-1c4b-4281-b951-d872f2087c98
parent 043f595a
......@@ -1958,8 +1958,12 @@
'test/chrome_process_util_linux.cc',
'test/chrome_process_util_mac.cc',
'test/chrome_process_util_win.cc',
'test/in_process_browser_test.cc',
'test/in_process_browser_test.h',
'test/testing_profile.cc',
'test/testing_profile.h',
'test/ui_test_utils.cc',
'test/ui_test_utils.h',
],
'conditions': [
['OS=="linux"', {
......@@ -1975,6 +1979,10 @@
'sources!': [
'test/automation/autocomplete_edit_proxy.cc',
'test/automation/autocomplete_edit_proxy.h',
'test/in_process_browser_test.cc',
'test/in_process_browser_test.h',
'test/ui_test_utils.cc',
'test/ui_test_utils.h',
],
}],
],
......@@ -2362,7 +2370,6 @@
'browser/task_manager_unittest.cc',
'browser/theme_resources_util_unittest.cc',
'browser/views/bookmark_editor_view_unittest.cc',
'browser/views/find_bar_win_unittest.cc',
'browser/views/keyword_editor_view_unittest.cc',
'browser/visitedlink_unittest.cc',
'browser/webdata/web_database_unittest.cc',
......@@ -2409,14 +2416,10 @@
'renderer/renderer_main_unittest.cc',
'test/browser_with_test_window_test.cc',
'test/browser_with_test_window_test.h',
'test/in_process_browser_test.cc',
'test/in_process_browser_test.h',
'test/render_view_test.cc',
'test/render_view_test.h',
'test/test_notification_tracker.cc',
'test/test_notification_tracker.h',
'test/ui_test_utils.cc',
'test/ui_test_utils.h',
'test/v8_unit_test.cc',
'test/v8_unit_test.h',
'views/controls/label_unittest.cc',
......@@ -2515,10 +2518,6 @@
'common/os_exchange_data_unittest.cc',
'test/browser_with_test_window_test.cc',
'test/browser_with_test_window_test.h',
'test/in_process_browser_test.cc',
'test/in_process_browser_test.h',
'test/ui_test_utils.cc',
'test/ui_test_utils.h',
'views/controls/label_unittest.cc',
'views/controls/table/table_view_unittest.cc',
'views/focus/focus_manager_unittest.cc',
......@@ -2557,8 +2556,6 @@
['OS!="win"', {
'sources!': [
'test/startup/feature_startup_test.cc',
'tools/build/win/precompiled.cc',
'tools/build/win/precompiled.h',
],
}],
],
......@@ -2968,6 +2965,102 @@
}], # OS=="win" or OS=="linux"
['OS=="win"',
{ 'targets': [
{
'target_name': 'interactive_ui_tests',
'type': 'executable',
'dependencies': [
'resources',
'test_support_common',
'test_support_ui',
'third_party/hunspell/hunspell.gyp:hunspell',
'views',
'../skia/skia.gyp:skia',
'../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
'../third_party/icu38/icu38.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',
],
'include_dirs': [
'..',
'third_party/wtl/include',
],
'sources': [
'browser/browser_focus_uitest.cc',
'browser/views/bookmark_bar_view_test.cc',
'browser/views/constrained_window_impl_interactive_uitest.cc',
'browser/views/find_bar_win_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',
'tools/build/win/precompiled_wtl.h',
'tools/build/win/precompiled_wtl.cc',
],
'configurations': {
'Debug': {
'msvs_precompiled_header': 'tools/build/win/precompiled_wtl.h',
'msvs_precompiled_source': 'tools/build/win/precompiled_wtl.cc',
},
},
},
{
'target_name': 'plugin_tests',
'type': 'executable',
'dependencies': [
'resources',
'test_support_common',
'test_support_ui',
'../skia/skia.gyp:skia',
'../testing/gtest.gyp:gtest',
'../third_party/libxml/libxml.gyp:libxml',
'../third_party/libxslt/libxslt.gyp:libxslt',
'../third_party/npapi/npapi.gyp:npapi',
],
'include_dirs': [
'..',
'third_party/wtl/include',
],
'sources': [
'test/plugin/plugin_test.cpp',
'tools/build/win/precompiled_wtl.h',
'tools/build/win/precompiled_wtl.cc',
],
'configurations': {
'Debug': {
'msvs_precompiled_header': 'tools/build/win/precompiled_wtl.h',
'msvs_precompiled_source': 'tools/build/win/precompiled_wtl.cc',
},
},
},
{
'target_name': 'selenium_tests',
'type': 'executable',
'dependencies': [
'resources',
'test_support_common',
'test_support_ui',
'../skia/skia.gyp:skia',
'../testing/gtest.gyp:gtest',
],
'include_dirs': [
'..',
'third_party/wtl/include',
],
'sources': [
'test/selenium/selenium_test.cc',
'tools/build/win/precompiled_wtl.h',
'tools/build/win/precompiled_wtl.cc',
],
'configurations': {
'Debug': {
'msvs_precompiled_header': 'tools/build/win/precompiled_wtl.h',
'msvs_precompiled_source': 'tools/build/win/precompiled_wtl.cc',
},
},
},
{
'target_name': 'worker',
'type': '<(library)',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment