| OLD | NEW |
| 1 { | 1 { |
| 2 'target_name': 'interactive_ui_tests', | 2 'target_name': 'interactive_ui_tests', |
| 3 'type': 'executable', | 3 'type': 'executable', |
| 4 'msvs_guid': '018D4F38-6272-448F-A864-976DA09F05D0', | 4 'msvs_guid': '018D4F38-6272-448F-A864-976DA09F05D0', |
| 5 'dependencies': [ | 5 'dependencies': [ |
| 6 '<(DEPTH)/chrome/chrome.gyp:chrome', | 6 '<(DEPTH)/chrome/chrome.gyp:chrome', |
| 7 '<(DEPTH)/chrome/chrome.gyp:chrome_resources', | 7 '<(DEPTH)/chrome/chrome.gyp:chrome_resources', |
| 8 '<(DEPTH)/chrome/chrome.gyp:chrome_strings', | 8 '<(DEPTH)/chrome/chrome.gyp:chrome_strings', |
| 9 '<(DEPTH)/chrome/chrome.gyp:debugger', | 9 '<(DEPTH)/chrome/chrome.gyp:debugger', |
| 10 '<(DEPTH)/chrome/chrome.gyp:test_support_common', | 10 '<(DEPTH)/chrome/chrome.gyp:test_support_common', |
| 11 '<(DEPTH)/chrome/chrome.gyp:test_support_ui', | 11 '<(DEPTH)/chrome/chrome.gyp:test_support_ui', |
| 12 '<(DEPTH)/chrome/chrome.gyp:syncapi', | 12 '<(DEPTH)/chrome/chrome.gyp:syncapi', |
| 13 '<(DEPTH)/third_party/hunspell/hunspell.gyp:hunspell', | 13 '<(DEPTH)/third_party/hunspell/hunspell.gyp:hunspell', |
| 14 '<(DEPTH)/net/net.gyp:net_resources', | 14 '<(DEPTH)/net/net.gyp:net_resources', |
| 15 '<(DEPTH)/skia/skia.gyp:skia', | 15 '<(DEPTH)/skia/skia.gyp:skia', |
| 16 '<(DEPTH)/third_party/icu/icu.gyp:icui18n', | 16 '<(DEPTH)/third_party/icu/icu.gyp:icui18n', |
| 17 '<(DEPTH)/third_party/libpng/libpng.gyp:libpng', | 17 '<(DEPTH)/third_party/libpng/libpng.gyp:libpng', |
| 18 '<(DEPTH)/third_party/libxml/libxml.gyp:libxml', | 18 '<(DEPTH)/third_party/libxml/libxml.gyp:libxml', |
| 19 '<(DEPTH)/third_party/zlib/zlib.gyp:zlib', | 19 '<(DEPTH)/third_party/zlib/zlib.gyp:zlib', |
| 20 '<(DEPTH)/testing/gtest.gyp:gtest', | 20 '<(DEPTH)/testing/gtest.gyp:gtest', |
| 21 '<(DEPTH)/third_party/npapi/npapi.gyp:npapi', | 21 '<(DEPTH)/third_party/npapi/npapi.gyp:npapi', |
| 22 # run time dependency | 22 # run time dependency |
| 23 '<(DEPTH)/webkit/webkit.gyp:webkit_resources', | 23 '<(DEPTH)/webkit/webkit.gyp:webkit_resources', |
| 24 ], | 24 ], |
| 25 'include_dirs': [ | 25 'include_dirs': [ |
| 26 '<(DEPTH)', | 26 '<(DEPTH)', |
| 27 ], | 27 ], |
| 28 # TODO(phajdan.jr): Only temporary, to make transition easier. | |
| 29 'defines': [ 'ALLOW_IN_PROC_BROWSER_TEST' ], | 28 'defines': [ 'ALLOW_IN_PROC_BROWSER_TEST' ], |
| 30 'sources': [ | 29 'sources': [ |
| 31 '<(DEPTH)/chrome/browser/autocomplete/autocomplete_edit_view_browsertest.cc'
, | 30 '<(DEPTH)/chrome/browser/autocomplete/autocomplete_edit_view_browsertest.cc'
, |
| 32 '<(DEPTH)/chrome/browser/browser_focus_uitest.cc', | 31 '<(DEPTH)/chrome/browser/browser_focus_uitest.cc', |
| 33 '<(DEPTH)/chrome/browser/browser_keyevents_browsertest.cc', | 32 '<(DEPTH)/chrome/browser/browser_keyevents_browsertest.cc', |
| 34 '<(DEPTH)/chrome/browser/debugger/devtools_sanity_unittest.cc', | 33 '<(DEPTH)/chrome/browser/debugger/devtools_sanity_unittest.cc', |
| 35 '<(DEPTH)/chrome/browser/views/bookmark_bar_view_test.cc', | 34 '<(DEPTH)/chrome/browser/views/bookmark_bar_view_test.cc', |
| 36 '<(DEPTH)/chrome/browser/blocked_popup_container_interactive_uitest.cc', | 35 '<(DEPTH)/chrome/browser/blocked_popup_container_interactive_uitest.cc', |
| 37 '<(DEPTH)/chrome/browser/views/find_bar_host_interactive_uitest.cc', | 36 '<(DEPTH)/chrome/browser/views/find_bar_host_interactive_uitest.cc', |
| 38 '<(DEPTH)/chrome/browser/views/tabs/tab_dragging_test.cc', | 37 '<(DEPTH)/chrome/browser/views/tabs/tab_dragging_test.cc', |
| 39 '<(DEPTH)/chrome/test/in_process_browser_test.cc', | 38 '<(DEPTH)/chrome/test/in_process_browser_test.cc', |
| 40 '<(DEPTH)/chrome/test/in_process_browser_test.h', | 39 '<(DEPTH)/chrome/test/in_process_browser_test.h', |
| 41 '<(DEPTH)/chrome/test/interactive_ui/npapi_interactive_test.cc', | 40 '<(DEPTH)/chrome/test/interactive_ui/npapi_interactive_test.cc', |
| 42 '<(DEPTH)/chrome/test/interactive_ui/view_event_test_base.cc', | 41 '<(DEPTH)/chrome/test/interactive_ui/view_event_test_base.cc', |
| 43 '<(DEPTH)/chrome/test/interactive_ui/view_event_test_base.h', | 42 '<(DEPTH)/chrome/test/interactive_ui/view_event_test_base.h', |
| 43 # TODO(jcampan): we should use in_proc_test_runner on Windows. |
| 44 '<(DEPTH)/chrome/test/test_launcher/out_of_proc_test_runner.cc', |
| 45 '<(DEPTH)/chrome/test/test_launcher/test_runner.cc', |
| 46 '<(DEPTH)/chrome/test/test_launcher/test_runner.h', |
| 47 '<(DEPTH)/chrome/test/test_launcher/run_all_unittests.cc', |
| 48 '<(DEPTH)/chrome/test/unit/chrome_test_suite.h', |
| 44 ], | 49 ], |
| 45 'conditions': [ | 50 'conditions': [ |
| 46 ['OS=="linux"', { | 51 ['OS=="linux"', { |
| 47 'dependencies': [ | 52 'dependencies': [ |
| 48 '<(DEPTH)/build/linux/system.gyp:gtk', | 53 '<(DEPTH)/build/linux/system.gyp:gtk', |
| 49 '<(DEPTH)/tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', | 54 '<(DEPTH)/tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', |
| 50 ], | 55 ], |
| 51 'sources!': [ | 56 'sources!': [ |
| 52 # TODO(jcampan) - Re-enable failing browsertests on linux: (crbug.com/26
540). | |
| 53 '<(DEPTH)/chrome/browser/autocomplete/autocomplete_edit_view_browsertest
.cc', | |
| 54 '<(DEPTH)/chrome/browser/browser_focus_uitest.cc', | |
| 55 '<(DEPTH)/chrome/browser/debugger/devtools_sanity_unittest.cc', | |
| 56 # TODO(port) | 57 # TODO(port) |
| 57 '<(DEPTH)/chrome/browser/views/bookmark_bar_view_test.cc', | 58 '<(DEPTH)/chrome/browser/views/bookmark_bar_view_test.cc', |
| 58 '<(DEPTH)/chrome/browser/views/find_bar_host_interactive_uitest.cc', | 59 '<(DEPTH)/chrome/browser/views/find_bar_host_interactive_uitest.cc', |
| 59 '<(DEPTH)/chrome/browser/views/tabs/tab_dragging_test.cc', | 60 '<(DEPTH)/chrome/browser/views/tabs/tab_dragging_test.cc', |
| 60 '<(DEPTH)/chrome/test/interactive_ui/npapi_interactive_test.cc', | 61 '<(DEPTH)/chrome/test/interactive_ui/npapi_interactive_test.cc', |
| 61 '<(DEPTH)/chrome/test/interactive_ui/view_event_test_base.cc', | 62 '<(DEPTH)/chrome/test/interactive_ui/view_event_test_base.cc', |
| 62 '<(DEPTH)/chrome/test/interactive_ui/view_event_test_base.h', | 63 '<(DEPTH)/chrome/test/interactive_ui/view_event_test_base.h', |
| 63 ], | 64 ], |
| 64 }], # OS=="linux" | 65 }], # OS=="linux" |
| 65 ['target_arch!="x64"', { | 66 ['target_arch!="x64"', { |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 131 'msvs_settings': { | 132 'msvs_settings': { |
| 132 'VCLinkerTool': { | 133 'VCLinkerTool': { |
| 133 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', | 134 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', |
| 134 }, | 135 }, |
| 135 }, | 136 }, |
| 136 }, | 137 }, |
| 137 }, # configurations | 138 }, # configurations |
| 138 }], # OS=="win" | 139 }], # OS=="win" |
| 139 ], # conditions | 140 ], # conditions |
| 140 } | 141 } |
| OLD | NEW |