| OLD | NEW |
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 { | 4 { |
| 5 'includes': [ | 5 'includes': [ |
| 6 'js_unittest_vars.gypi', | 6 'js_unittest_vars.gypi', |
| 7 ], | 7 ], |
| 8 'targets': [ | 8 'targets': [ |
| 9 { | 9 { |
| 10 'target_name': 'interactive_ui_tests', | 10 'target_name': 'interactive_ui_tests', |
| (...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 193 # Merge this back into the next block post switch to linux_aura. | 193 # Merge this back into the next block post switch to linux_aura. |
| 194 'browser/ui/panels/panel_drag_browsertest.cc', | 194 'browser/ui/panels/panel_drag_browsertest.cc', |
| 195 'browser/ui/panels/stacked_panel_browsertest.cc', | 195 'browser/ui/panels/stacked_panel_browsertest.cc', |
| 196 ], | 196 ], |
| 197 }], | 197 }], |
| 198 ['OS=="linux" and use_aura==1 and chromeos==0', { | 198 ['OS=="linux" and use_aura==1 and chromeos==0', { |
| 199 'sources!': [ | 199 'sources!': [ |
| 200 # TODO(port): Everything here times out. Attempts have been made to | 200 # TODO(port): Everything here times out. Attempts have been made to |
| 201 # fix the individual failures, but each time I disable a test from | 201 # fix the individual failures, but each time I disable a test from |
| 202 # these suites, it seems like one or another starts timing out too. | 202 # these suites, it seems like one or another starts timing out too. |
| 203 'browser/ui/omnibox/omnibox_view_browsertest.cc', | |
| 204 'browser/extensions/api/tabs/tabs_interactive_test.cc', | 203 'browser/extensions/api/tabs/tabs_interactive_test.cc', |
| 205 'browser/ui/views/keyboard_access_browsertest.cc', | 204 'browser/ui/views/keyboard_access_browsertest.cc', |
| 206 ], | 205 ], |
| 207 }], | 206 }], |
| 208 ['use_ash==1', { | 207 ['use_ash==1', { |
| 209 'sources': [ | 208 'sources': [ |
| 210 '../ash/drag_drop/drag_drop_interactive_uitest.cc', | 209 '../ash/drag_drop/drag_drop_interactive_uitest.cc', |
| 211 '../ash/wm/ash_native_cursor_manager_interactive_uitest.cc', | 210 '../ash/wm/ash_native_cursor_manager_interactive_uitest.cc', |
| 212 'browser/ui/window_sizer/window_sizer_ash_uitest.cc', | 211 'browser/ui/window_sizer/window_sizer_ash_uitest.cc', |
| 213 ], | 212 ], |
| (...skipping 2849 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3063 ['enable_webrtc==1', { | 3062 ['enable_webrtc==1', { |
| 3064 'dependencies': [ | 3063 'dependencies': [ |
| 3065 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc' | 3064 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc' |
| 3066 ] | 3065 ] |
| 3067 }], | 3066 }], |
| 3068 ], | 3067 ], |
| 3069 }] | 3068 }] |
| 3070 }], | 3069 }], |
| 3071 ], # 'conditions' | 3070 ], # 'conditions' |
| 3072 } | 3071 } |
| OLD | NEW |