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