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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome.gyp

Issue 100168: chrome.gyp updates: (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 8 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome.gyp
===================================================================
--- chrome/chrome.gyp (revision 15003)
+++ chrome/chrome.gyp (working copy)
@@ -1957,8 +1957,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"', {
@@ -1974,6 +1978,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',
],
}],
],
@@ -2359,7 +2367,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',
@@ -2406,14 +2413,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',
@@ -2512,10 +2515,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',
@@ -2554,8 +2553,6 @@
['OS!="win"', {
'sources!': [
'test/startup/feature_startup_test.cc',
- 'tools/build/win/precompiled.cc',
- 'tools/build/win/precompiled.h',
],
}],
],
@@ -2966,6 +2963,102 @@
['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)',
'dependencies': [
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698