| 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', |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 42 '<(DEPTH)/chrome/test/interactive_ui/view_event_test_base.cc', | 42 '<(DEPTH)/chrome/test/interactive_ui/view_event_test_base.cc', |
| 43 '<(DEPTH)/chrome/test/interactive_ui/view_event_test_base.h', | 43 '<(DEPTH)/chrome/test/interactive_ui/view_event_test_base.h', |
| 44 ], | 44 ], |
| 45 'conditions': [ | 45 'conditions': [ |
| 46 ['OS=="linux"', { | 46 ['OS=="linux"', { |
| 47 'dependencies': [ | 47 'dependencies': [ |
| 48 '<(DEPTH)/build/linux/system.gyp:gtk', | 48 '<(DEPTH)/build/linux/system.gyp:gtk', |
| 49 '<(DEPTH)/tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', | 49 '<(DEPTH)/tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', |
| 50 ], | 50 ], |
| 51 'sources!': [ | 51 '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', |
| 52 # TODO(port) | 56 # TODO(port) |
| 53 '<(DEPTH)/chrome/browser/views/bookmark_bar_view_test.cc', | 57 '<(DEPTH)/chrome/browser/views/bookmark_bar_view_test.cc', |
| 54 '<(DEPTH)/chrome/browser/views/find_bar_host_interactive_uitest.cc', | 58 '<(DEPTH)/chrome/browser/views/find_bar_host_interactive_uitest.cc', |
| 55 '<(DEPTH)/chrome/browser/views/tabs/tab_dragging_test.cc', | 59 '<(DEPTH)/chrome/browser/views/tabs/tab_dragging_test.cc', |
| 56 '<(DEPTH)/chrome/test/interactive_ui/npapi_interactive_test.cc', | 60 '<(DEPTH)/chrome/test/interactive_ui/npapi_interactive_test.cc', |
| 57 '<(DEPTH)/chrome/test/interactive_ui/view_event_test_base.cc', | 61 '<(DEPTH)/chrome/test/interactive_ui/view_event_test_base.cc', |
| 58 '<(DEPTH)/chrome/test/interactive_ui/view_event_test_base.h', | 62 '<(DEPTH)/chrome/test/interactive_ui/view_event_test_base.h', |
| 59 ], | 63 ], |
| 60 }], # OS=="linux" | 64 }], # OS=="linux" |
| 61 ['target_arch!="x64"', { | 65 ['target_arch!="x64"', { |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 127 'msvs_settings': { | 131 'msvs_settings': { |
| 128 'VCLinkerTool': { | 132 'VCLinkerTool': { |
| 129 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', | 133 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', |
| 130 }, | 134 }, |
| 131 }, | 135 }, |
| 132 }, | 136 }, |
| 133 }, # configurations | 137 }, # configurations |
| 134 }], # OS=="win" | 138 }], # OS=="win" |
| 135 ], # conditions | 139 ], # conditions |
| 136 } | 140 } |
| OLD | NEW |