Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2776)

Unified Diff: chrome/test/BUILD.gn

Issue 1345013002: Add is_chromecast to GN build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Rebase + ui changes. Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | chromecast/build/args.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/BUILD.gn
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 95df486d1a720990e5462924b819003efefc3f3b..0f5d4e421838a83290205dd7f9f408cd76699e42 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -339,6 +339,16 @@ if (!is_android) {
# TODO(gbillock): aura linux does not support the automation for
# SendMouseMoveNotifyWhenDone
sources -= [ "../browser/ui/views/toolbar/toolbar_button_test.cc" ]
+
+ if (!is_chromeos) {
+ # Desktop linux.
+ sources -= [
+ # TODO(port): This times out. Attempts have been made to fix the
+ # individual failures, but each time I disable a test from these
+ # suites, it seems like one or another starts timing out too.
+ "../browser/ui/views/keyboard_access_browsertest.cc",
+ ]
+ }
}
if (is_chromeos || !use_x11) {
sources -= [
@@ -351,15 +361,7 @@ if (!is_android) {
}
}
- if (is_linux && !is_chromeos) {
- # Desktop linux.
- sources -= [
- # TODO(port): This times out. Attempts have been made to fix the
- # individual failures, but each time I disable a test from these
- # suites, it seems like one or another starts timing out too.
- "../browser/ui/views/keyboard_access_browsertest.cc",
- ]
- } else {
+ if (!is_desktop_linux) {
# Everything but desktop Linux.
sources += rebase_path(
chrome_tests_gypi_values.chrome_interactive_ui_test_non_desktop_linux_sources,
@@ -998,8 +1000,11 @@ if (!is_android) {
"../browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc",
"../browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc",
"../browser/ui/ash/shelf_browsertest.cc",
- "../browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc",
]
+
+ if (toolkit_views) {
+ sources -= [ "../browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc" ]
+ }
}
if (is_mac) {
# TODO(mark): We really want this for all non-static library
@@ -1715,9 +1720,6 @@ if (!is_android) {
".",
"//chrome")
}
- if (!toolkit_views) {
- sources -= [ "../browser/ui/views/media_router/media_router_ui_browsertest.cc" ]
- }
}
if (enable_webrtc) {
sources += rebase_path(
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | chromecast/build/args.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698