OLD | NEW |
1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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 import("//build/config/chrome_build.gni") | 5 import("//build/config/chrome_build.gni") |
6 import("//build/config/compiler/compiler.gni") | 6 import("//build/config/compiler/compiler.gni") |
7 import("//build/config/crypto.gni") | 7 import("//build/config/crypto.gni") |
8 import("//build/config/features.gni") | 8 import("//build/config/features.gni") |
9 import("//build/config/ui.gni") | 9 import("//build/config/ui.gni") |
10 import("//chrome/chrome_tests.gni") | 10 import("//chrome/chrome_tests.gni") |
(...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
333 if (!is_mac) { | 333 if (!is_mac) { |
334 sources += rebase_path( | 334 sources += rebase_path( |
335 chrome_tests_gypi_values.chrome_interactive_ui_test_views_non_ma
c_sources, | 335 chrome_tests_gypi_values.chrome_interactive_ui_test_views_non_ma
c_sources, |
336 ".", | 336 ".", |
337 "//chrome") | 337 "//chrome") |
338 } | 338 } |
339 if (is_linux) { | 339 if (is_linux) { |
340 # TODO(gbillock): aura linux does not support the automation for | 340 # TODO(gbillock): aura linux does not support the automation for |
341 # SendMouseMoveNotifyWhenDone | 341 # SendMouseMoveNotifyWhenDone |
342 sources -= [ "../browser/ui/views/toolbar/toolbar_button_test.cc" ] | 342 sources -= [ "../browser/ui/views/toolbar/toolbar_button_test.cc" ] |
| 343 |
| 344 if (!is_chromeos) { |
| 345 # Desktop linux. |
| 346 sources -= [ |
| 347 # TODO(port): This times out. Attempts have been made to fix the |
| 348 # individual failures, but each time I disable a test from these |
| 349 # suites, it seems like one or another starts timing out too. |
| 350 "../browser/ui/views/keyboard_access_browsertest.cc", |
| 351 ] |
| 352 } |
343 } | 353 } |
344 if (is_chromeos || !use_x11) { | 354 if (is_chromeos || !use_x11) { |
345 sources -= [ | 355 sources -= [ |
346 "../../ui/views/widget/desktop_aura/desktop_window_tree_host_x11_inter
active_uitest.cc", | 356 "../../ui/views/widget/desktop_aura/desktop_window_tree_host_x11_inter
active_uitest.cc", |
347 "../../ui/views/widget/desktop_aura/x11_topmost_window_finder_interact
ive_uitest.cc", | 357 "../../ui/views/widget/desktop_aura/x11_topmost_window_finder_interact
ive_uitest.cc", |
348 ] | 358 ] |
349 } | 359 } |
350 if (use_aura) { | 360 if (use_aura) { |
351 deps += [ "//ui/touch_selection" ] | 361 deps += [ "//ui/touch_selection" ] |
352 } | 362 } |
353 } | 363 } |
354 | 364 |
355 if (is_linux && !is_chromeos) { | 365 if (!is_desktop_linux) { |
356 # Desktop linux. | |
357 sources -= [ | |
358 # TODO(port): This times out. Attempts have been made to fix the | |
359 # individual failures, but each time I disable a test from these | |
360 # suites, it seems like one or another starts timing out too. | |
361 "../browser/ui/views/keyboard_access_browsertest.cc", | |
362 ] | |
363 } else { | |
364 # Everything but desktop Linux. | 366 # Everything but desktop Linux. |
365 sources += rebase_path( | 367 sources += rebase_path( |
366 chrome_tests_gypi_values.chrome_interactive_ui_test_non_desktop_li
nux_sources, | 368 chrome_tests_gypi_values.chrome_interactive_ui_test_non_desktop_li
nux_sources, |
367 ".", | 369 ".", |
368 "//chrome") | 370 "//chrome") |
369 } | 371 } |
370 | 372 |
371 if (is_chromeos) { | 373 if (is_chromeos) { |
372 sources += rebase_path( | 374 sources += rebase_path( |
373 chrome_tests_gypi_values.chrome_interactive_ui_test_chromeos_sourc
es, | 375 chrome_tests_gypi_values.chrome_interactive_ui_test_chromeos_sourc
es, |
(...skipping 618 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
992 sources -= [ | 994 sources -= [ |
993 # On Windows and Linux, we currently don't support enough of the | 995 # On Windows and Linux, we currently don't support enough of the |
994 # ash environment to run these unit tests. | 996 # ash environment to run these unit tests. |
995 # | 997 # |
996 # TODO: enable these on windows and linux. | 998 # TODO: enable these on windows and linux. |
997 "../browser/ui/ash/accelerator_commands_browsertest.cc", | 999 "../browser/ui/ash/accelerator_commands_browsertest.cc", |
998 "../browser/ui/ash/accelerator_controller_browsertest.cc", | 1000 "../browser/ui/ash/accelerator_controller_browsertest.cc", |
999 "../browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc", | 1001 "../browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc", |
1000 "../browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc", | 1002 "../browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc", |
1001 "../browser/ui/ash/shelf_browsertest.cc", | 1003 "../browser/ui/ash/shelf_browsertest.cc", |
1002 "../browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest
.cc", | |
1003 ] | 1004 ] |
| 1005 |
| 1006 if (toolkit_views) { |
| 1007 sources -= [ "../browser/ui/views/frame/browser_non_client_frame_view_as
h_browsertest.cc" ] |
| 1008 } |
1004 } | 1009 } |
1005 if (is_mac) { | 1010 if (is_mac) { |
1006 # TODO(mark): We really want this for all non-static library | 1011 # TODO(mark): We really want this for all non-static library |
1007 # targets, but when we tried to pull it up to the common.gypi | 1012 # targets, but when we tried to pull it up to the common.gypi |
1008 # level, it broke other things like the ui and startup tests. *shrug* | 1013 # level, it broke other things like the ui and startup tests. *shrug* |
1009 ldflags = [ "-Wl,-ObjC" ] | 1014 ldflags = [ "-Wl,-ObjC" ] |
1010 | 1015 |
1011 # Other platforms only need | 1016 # Other platforms only need |
1012 # chrome_resources.gyp:{packed_extra_resources,packed_resources}, | 1017 # chrome_resources.gyp:{packed_extra_resources,packed_resources}, |
1013 # and can build this target standalone much faster. | 1018 # and can build this target standalone much faster. |
(...skipping 695 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1709 chrome_tests_unit_gypi_values.chrome_unit_tests_media_router_sourc
es, | 1714 chrome_tests_unit_gypi_values.chrome_unit_tests_media_router_sourc
es, |
1710 ".", | 1715 ".", |
1711 "//chrome") | 1716 "//chrome") |
1712 deps += [ "//chrome/browser/media/router:test_support" ] | 1717 deps += [ "//chrome/browser/media/router:test_support" ] |
1713 if (!is_android) { | 1718 if (!is_android) { |
1714 sources += rebase_path( | 1719 sources += rebase_path( |
1715 chrome_tests_unit_gypi_values.chrome_unit_tests_media_router_non
_android_sources, | 1720 chrome_tests_unit_gypi_values.chrome_unit_tests_media_router_non
_android_sources, |
1716 ".", | 1721 ".", |
1717 "//chrome") | 1722 "//chrome") |
1718 } | 1723 } |
1719 if (!toolkit_views) { | 1724 if (toolkit_views) { |
1720 sources -= [ "../browser/ui/views/media_router/media_router_ui_browserte
st.cc" ] | 1725 sources -= [ "../browser/ui/views/media_router/media_router_ui_browserte
st.cc" ] |
1721 } | 1726 } |
1722 } | 1727 } |
1723 if (enable_webrtc) { | 1728 if (enable_webrtc) { |
1724 sources += rebase_path( | 1729 sources += rebase_path( |
1725 chrome_tests_unit_gypi_values.chrome_unit_tests_webrtc_sources, | 1730 chrome_tests_unit_gypi_values.chrome_unit_tests_webrtc_sources, |
1726 ".", | 1731 ".", |
1727 "//chrome") | 1732 "//chrome") |
1728 } | 1733 } |
1729 if (is_chromeos) { | 1734 if (is_chromeos) { |
(...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2010 "//third_party/mojo/src/mojo/edk/system", | 2015 "//third_party/mojo/src/mojo/edk/system", |
2011 ] | 2016 ] |
2012 | 2017 |
2013 if (!is_android && use_ash) { | 2018 if (!is_android && use_ash) { |
2014 sources += rebase_path( | 2019 sources += rebase_path( |
2015 chrome_tests_unit_gypi_values.chrome_test_support_unit_ash_sources, | 2020 chrome_tests_unit_gypi_values.chrome_test_support_unit_ash_sources, |
2016 ".", | 2021 ".", |
2017 "//chrome") | 2022 "//chrome") |
2018 } | 2023 } |
2019 } | 2024 } |
OLD | NEW |