| 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 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 172 '../build/linux/system.gyp:ssl', | 172 '../build/linux/system.gyp:ssl', |
| 173 ], | 173 ], |
| 174 }], | 174 }], |
| 175 ['OS=="linux" and chromeos==0', { | 175 ['OS=="linux" and chromeos==0', { |
| 176 'sources!': [ | 176 'sources!': [ |
| 177 # TODO(port): Disable all the interactive panel tests on all linux | 177 # TODO(port): Disable all the interactive panel tests on all linux |
| 178 # platforms. These are badly busted on linux_aura, also time out | 178 # platforms. These are badly busted on linux_aura, also time out |
| 179 # when run under openbox. | 179 # when run under openbox. |
| 180 # | 180 # |
| 181 # Merge this back into the next block post switch to linux_aura. | 181 # Merge this back into the next block post switch to linux_aura. |
| 182 'browser/ui/panels/base_panel_browser_test.cc', | |
| 183 'browser/ui/panels/base_panel_browser_test.h', | |
| 184 'browser/ui/panels/detached_panel_browsertest.cc', | |
| 185 'browser/ui/panels/docked_panel_browsertest.cc', | |
| 186 'browser/ui/panels/panel_browsertest.cc', | |
| 187 'browser/ui/panels/panel_drag_browsertest.cc', | 182 'browser/ui/panels/panel_drag_browsertest.cc', |
| 188 'browser/ui/panels/panel_resize_browsertest.cc', | |
| 189 'browser/ui/panels/stacked_panel_browsertest.cc', | 183 'browser/ui/panels/stacked_panel_browsertest.cc', |
| 190 'browser/ui/views/panels/panel_view_browsertest.cc', | |
| 191 ], | 184 ], |
| 192 }], | 185 }], |
| 193 ['OS=="linux" and use_aura==1 and chromeos==0', { | 186 ['OS=="linux" and use_aura==1 and chromeos==0', { |
| 194 'sources!': [ | 187 'sources!': [ |
| 195 # TODO(port): Everything here times out. Attempts have been made to | 188 # TODO(port): Everything here times out. Attempts have been made to |
| 196 # fix the individual failures, but each time I disable a test from | 189 # fix the individual failures, but each time I disable a test from |
| 197 # these suites, it seems like one or another starts timing out too. | 190 # these suites, it seems like one or another starts timing out too. |
| 198 'browser/ui/omnibox/omnibox_view_browsertest.cc', | 191 'browser/ui/omnibox/omnibox_view_browsertest.cc', |
| 199 'browser/extensions/api/tabs/tabs_interactive_test.cc', | 192 'browser/extensions/api/tabs/tabs_interactive_test.cc', |
| 200 'browser/ui/views/keyboard_access_browsertest.cc', | 193 'browser/ui/views/keyboard_access_browsertest.cc', |
| (...skipping 2785 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2986 ['enable_webrtc==1', { | 2979 ['enable_webrtc==1', { |
| 2987 'dependencies': [ | 2980 'dependencies': [ |
| 2988 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc' | 2981 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc' |
| 2989 ] | 2982 ] |
| 2990 }], | 2983 }], |
| 2991 ], | 2984 ], |
| 2992 }] | 2985 }] |
| 2993 }], | 2986 }], |
| 2994 ], # 'conditions' | 2987 ], # 'conditions' |
| 2995 } | 2988 } |
| OLD | NEW |