| 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/crypto.gni") | 5 import("//build/config/crypto.gni") |
| 6 import("//build/config/features.gni") | 6 import("//build/config/features.gni") |
| 7 import("//build/config/ui.gni") | 7 import("//build/config/ui.gni") |
| 8 import("//build/module_args/v8.gni") | 8 import("//build/module_args/v8.gni") |
| 9 import("//testing/test.gni") | 9 import("//testing/test.gni") |
| 10 | 10 |
| (...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 209 "//chrome:resources", | 209 "//chrome:resources", |
| 210 "//chrome:strings", | 210 "//chrome:strings", |
| 211 "//chrome/browser", | 211 "//chrome/browser", |
| 212 "//chrome/common", | 212 "//chrome/common", |
| 213 "//mojo/environment:chromium", | 213 "//mojo/environment:chromium", |
| 214 "//third_party/mojo/src/mojo/edk/system", | 214 "//third_party/mojo/src/mojo/edk/system", |
| 215 ] | 215 ] |
| 216 } | 216 } |
| 217 | 217 |
| 218 if (!is_android && (!is_win || link_chrome_on_windows)) { | 218 if (!is_android && (!is_win || link_chrome_on_windows)) { |
| 219 gypi_values = exec_script("//build/gypi_to_gn.py", | 219 import("//chrome/chrome_tests.gni") |
| 220 [ rebase_path("../chrome_tests.gypi") ], | |
| 221 "scope", | |
| 222 [ "../chrome_tests.gypi" ]) | |
| 223 | 220 |
| 224 test("interactive_ui_tests") { | 221 test("interactive_ui_tests") { |
| 225 sources = rebase_path(gypi_values.chrome_interactive_ui_test_sources, | 222 sources = |
| 226 ".", | 223 rebase_path(chrome_tests_gypi_values.chrome_interactive_ui_test_sources, |
| 227 "//chrome") | 224 ".", |
| 225 "//chrome") |
| 228 | 226 |
| 229 defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ] | 227 defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ] |
| 230 ldflags = [] | 228 ldflags = [] |
| 231 | 229 |
| 232 deps = [ | 230 deps = [ |
| 233 "//base/allocator", | 231 "//base/allocator", |
| 234 "//chrome/browser", | 232 "//chrome/browser", |
| 235 "//chrome/browser/devtools", | 233 "//chrome/browser/devtools", |
| 236 "//chrome/renderer", | 234 "//chrome/renderer", |
| 237 "//chrome/test:test_support", | 235 "//chrome/test:test_support", |
| (...skipping 22 matching lines...) Expand all Loading... |
| 260 "//ui/base:test_support", | 258 "//ui/base:test_support", |
| 261 "//ui/web_dialogs:test_support", | 259 "//ui/web_dialogs:test_support", |
| 262 ] | 260 ] |
| 263 | 261 |
| 264 # Runtime dependencies | 262 # Runtime dependencies |
| 265 datadeps = [ | 263 datadeps = [ |
| 266 "//third_party/mesa:osmesa", | 264 "//third_party/mesa:osmesa", |
| 267 ] | 265 ] |
| 268 | 266 |
| 269 if (toolkit_views) { | 267 if (toolkit_views) { |
| 270 sources += | 268 sources += rebase_path( |
| 271 rebase_path(gypi_values.chrome_interactive_ui_test_views_sources, | 269 chrome_tests_gypi_values.chrome_interactive_ui_test_views_sources, |
| 272 ".", | 270 ".", |
| 273 "//chrome") | 271 "//chrome") |
| 274 deps += [ | 272 deps += [ |
| 275 "//ui/views", | 273 "//ui/views", |
| 276 "//ui/views:test_support", | 274 "//ui/views:test_support", |
| 277 "//ui/views/controls/webview:test_support", | 275 "//ui/views/controls/webview:test_support", |
| 278 ] | 276 ] |
| 279 if (!is_mac) { | 277 if (!is_mac) { |
| 280 sources += rebase_path( | 278 sources += rebase_path( |
| 281 gypi_values.chrome_interactive_ui_test_views_non_mac_sources, | 279 chrome_tests_gypi_values.chrome_interactive_ui_test_views_non_ma
c_sources, |
| 282 ".", | 280 ".", |
| 283 "//chrome") | 281 "//chrome") |
| 284 } | 282 } |
| 285 if (is_linux) { | 283 if (is_linux) { |
| 286 # TODO(gbillock): aura linux does not support the automation for | 284 # TODO(gbillock): aura linux does not support the automation for |
| 287 # SendMouseMoveNotifyWhenDone | 285 # SendMouseMoveNotifyWhenDone |
| 288 sources -= [ "../browser/ui/views/toolbar/toolbar_button_test.cc" ] | 286 sources -= [ "../browser/ui/views/toolbar/toolbar_button_test.cc" ] |
| 289 } | 287 } |
| 290 if (is_chromeos || !use_x11) { | 288 if (is_chromeos || !use_x11) { |
| 291 sources -= [ | 289 sources -= [ |
| 292 "../../ui/views/widget/desktop_aura/desktop_window_tree_host_x11_inter
active_uitest.cc", | 290 "../../ui/views/widget/desktop_aura/desktop_window_tree_host_x11_inter
active_uitest.cc", |
| 293 "../../ui/views/widget/desktop_aura/x11_topmost_window_finder_interact
ive_uitest.cc", | 291 "../../ui/views/widget/desktop_aura/x11_topmost_window_finder_interact
ive_uitest.cc", |
| 294 ] | 292 ] |
| 295 } | 293 } |
| 296 } | 294 } |
| 297 | 295 |
| 298 if (is_linux && !is_chromeos) { | 296 if (is_linux && !is_chromeos) { |
| 299 # Desktop linux. | 297 # Desktop linux. |
| 300 sources -= [ | 298 sources -= [ |
| 301 # TODO(port): This times out. Attempts have been made to fix the | 299 # TODO(port): This times out. Attempts have been made to fix the |
| 302 # individual failures, but each time I disable a test from these | 300 # individual failures, but each time I disable a test from these |
| 303 # suites, it seems like one or another starts timing out too. | 301 # suites, it seems like one or another starts timing out too. |
| 304 "../browser/ui/views/keyboard_access_browsertest.cc", | 302 "../browser/ui/views/keyboard_access_browsertest.cc", |
| 305 ] | 303 ] |
| 306 } else { | 304 } else { |
| 307 # Everything but desktop Linux. | 305 # Everything but desktop Linux. |
| 308 sources += rebase_path( | 306 sources += rebase_path( |
| 309 gypi_values.chrome_interactive_ui_test_non_desktop_linux_sources, | 307 chrome_tests_gypi_values.chrome_interactive_ui_test_non_desktop_li
nux_sources, |
| 310 ".", | 308 ".", |
| 311 "//chrome") | 309 "//chrome") |
| 312 } | 310 } |
| 313 | 311 |
| 314 if (is_chromeos) { | 312 if (is_chromeos) { |
| 315 sources += | 313 sources += rebase_path( |
| 316 rebase_path(gypi_values.chrome_interactive_ui_test_chromeos_sources, | 314 chrome_tests_gypi_values.chrome_interactive_ui_test_chromeos_sourc
es, |
| 317 ".", | 315 ".", |
| 318 "//chrome") | 316 "//chrome") |
| 319 sources += [ "../browser/notifications/login_state_notification_blocker_ch
romeos_browsertest.cc" ] | 317 sources += [ "../browser/notifications/login_state_notification_blocker_ch
romeos_browsertest.cc" ] |
| 320 sources -= [ | 318 sources -= [ |
| 321 # Use only the _chromeos version on ChromeOS. | 319 # Use only the _chromeos version on ChromeOS. |
| 322 "base/view_event_test_platform_part_ash.cc", | 320 "base/view_event_test_platform_part_ash.cc", |
| 323 ] | 321 ] |
| 324 | 322 |
| 325 deps += [ | 323 deps += [ |
| 326 "//ash/resources", | 324 "//ash/resources", |
| 327 "//chromeos", | 325 "//chromeos", |
| 328 ] | 326 ] |
| 329 | 327 |
| 330 if (enable_nacl) { | 328 if (enable_nacl) { |
| 331 deps += [ | 329 deps += [ |
| 332 "//native_client/src/trusted/service_runtime/linux:munge_nacl_helper_b
ootstrap", | 330 "//native_client/src/trusted/service_runtime/linux:munge_nacl_helper_b
ootstrap", |
| 333 "//components/nacl:nacl_helper", | 331 "//components/nacl:nacl_helper", |
| 334 | 332 |
| 335 # '../components/nacl_nonsfi.gyp:nacl_helper_nonsfi', TODO(GYP) | 333 # '../components/nacl_nonsfi.gyp:nacl_helper_nonsfi', TODO(GYP) |
| 336 ] | 334 ] |
| 337 } | 335 } |
| 338 | 336 |
| 339 if (is_chrome_branded) { | 337 if (is_chrome_branded) { |
| 340 sources -= [ | 338 sources -= [ |
| 341 # These tests are failing on official cros bots. crbug.com/431450. | 339 # These tests are failing on official cros bots. crbug.com/431450. |
| 342 "../browser/ui/views/bookmarks/bookmark_bar_view_test.cc", | 340 "../browser/ui/views/bookmarks/bookmark_bar_view_test.cc", |
| 343 ] | 341 ] |
| 344 } | 342 } |
| 345 } else { | 343 } else { |
| 346 # ChromeOS doesn't use panels, everybody else does. | 344 # ChromeOS doesn't use panels, everybody else does. |
| 347 sources += | 345 sources += rebase_path( |
| 348 rebase_path(gypi_values.chrome_interactive_ui_test_panels_sources, | 346 chrome_tests_gypi_values.chrome_interactive_ui_test_panels_sources
, |
| 349 ".", | 347 ".", |
| 350 "//chrome") | 348 "//chrome") |
| 351 | 349 |
| 352 # TODO(tapted): Include on mac when views panels are ported. | 350 # TODO(tapted): Include on mac when views panels are ported. |
| 353 if (toolkit_views && !is_mac) { | 351 if (toolkit_views && !is_mac) { |
| 354 sources += rebase_path( | 352 sources += rebase_path( |
| 355 gypi_values.chrome_interactive_ui_test_panels_views_sources, | 353 chrome_tests_gypi_values.chrome_interactive_ui_test_panels_views
_sources, |
| 356 ".", | 354 ".", |
| 357 "//chrome") | 355 "//chrome") |
| 358 } | 356 } |
| 359 } | 357 } |
| 360 | 358 |
| 361 if (!is_linux) { | 359 if (!is_linux) { |
| 362 # Non-Linux platforms (Linux includes ChromeOS here). | 360 # Non-Linux platforms (Linux includes ChromeOS here). |
| 363 sources += rebase_path( | 361 sources += rebase_path( |
| 364 gypi_values.chrome_interactive_ui_test_non_linux_and_chromeos_sour
ces, | 362 chrome_tests_gypi_values.chrome_interactive_ui_test_non_linux_and_
chromeos_sources, |
| 365 ".", | 363 ".", |
| 366 "//chrome") | 364 "//chrome") |
| 367 } | 365 } |
| 368 | 366 |
| 369 if (is_win) { | 367 if (is_win) { |
| 370 sources += rebase_path(gypi_values.chrome_interactive_ui_test_win_sources, | 368 sources += rebase_path( |
| 371 ".", | 369 chrome_tests_gypi_values.chrome_interactive_ui_test_win_sources, |
| 372 "//chrome") | 370 ".", |
| 371 "//chrome") |
| 373 sources += [ "$root_gen_dir/chrome/other_version.rc" ] | 372 sources += [ "$root_gen_dir/chrome/other_version.rc" ] |
| 374 deps += [ | 373 deps += [ |
| 375 "//chrome:chrome_version_resources", | 374 "//chrome:chrome_version_resources", |
| 376 "//third_party/isimpledom", | 375 "//third_party/isimpledom", |
| 377 "//third_party/wtl", | 376 "//third_party/wtl", |
| 378 "//ui/resources", | 377 "//ui/resources", |
| 379 ] | 378 ] |
| 380 } | 379 } |
| 381 | 380 |
| 382 if (is_mac) { | 381 if (is_mac) { |
| (...skipping 10 matching lines...) Expand all Loading... |
| 393 # application embedder is using. | 392 # application embedder is using. |
| 394 deps += [ "//third_party/cld_2:cld2_platform_impl" ] | 393 deps += [ "//third_party/cld_2:cld2_platform_impl" ] |
| 395 } | 394 } |
| 396 | 395 |
| 397 if (use_x11) { | 396 if (use_x11) { |
| 398 configs += [ "//build/config/linux:xtst" ] | 397 configs += [ "//build/config/linux:xtst" ] |
| 399 datadeps += [ "//tools/xdisplaycheck" ] | 398 datadeps += [ "//tools/xdisplaycheck" ] |
| 400 } | 399 } |
| 401 | 400 |
| 402 if (enable_app_list) { | 401 if (enable_app_list) { |
| 403 sources += | 402 sources += rebase_path( |
| 404 rebase_path(gypi_values.chrome_interactive_ui_test_app_list_sources, | 403 chrome_tests_gypi_values.chrome_interactive_ui_test_app_list_sourc
es, |
| 405 ".", | 404 ".", |
| 406 "//chrome") | 405 "//chrome") |
| 407 } | 406 } |
| 408 | 407 |
| 409 if (use_ash) { | 408 if (use_ash) { |
| 410 sources += rebase_path(gypi_values.chrome_interactive_ui_test_ash_sources, | 409 sources += rebase_path( |
| 411 ".", | 410 chrome_tests_gypi_values.chrome_interactive_ui_test_ash_sources, |
| 412 "//chrome") | 411 ".", |
| 412 "//chrome") |
| 413 deps += [ "//ash:test_support" ] | 413 deps += [ "//ash:test_support" ] |
| 414 } | 414 } |
| 415 | 415 |
| 416 if (enable_notifications) { | 416 if (enable_notifications) { |
| 417 sources += rebase_path( | 417 sources += rebase_path( |
| 418 gypi_values.chrome_interactive_ui_test_notifications_sources, | 418 chrome_tests_gypi_values.chrome_interactive_ui_test_notifications_
sources, |
| 419 ".", | 419 ".", |
| 420 "//chrome") | 420 "//chrome") |
| 421 | 421 |
| 422 # Non-ChromeOS notifications tests (ChromeOS does not use cross-platform | 422 # Non-ChromeOS notifications tests (ChromeOS does not use cross-platform |
| 423 # panels). | 423 # panels). |
| 424 if (!is_chromeos) { | 424 if (!is_chromeos) { |
| 425 sources += [ | 425 sources += [ |
| 426 "../browser/notifications/notification_browsertest.cc", | 426 "../browser/notifications/notification_browsertest.cc", |
| 427 "../browser/notifications/platform_notification_service_browsertest.cc
", | 427 "../browser/notifications/platform_notification_service_browsertest.cc
", |
| 428 ] | 428 ] |
| (...skipping 12 matching lines...) Expand all Loading... |
| 441 } # enable_notifications | 441 } # enable_notifications |
| 442 | 442 |
| 443 if (use_aura || is_chromeos) { | 443 if (use_aura || is_chromeos) { |
| 444 sources -= | 444 sources -= |
| 445 [ "../../ui/views/corewm/desktop_capture_controller_unittest.cc" ] | 445 [ "../../ui/views/corewm/desktop_capture_controller_unittest.cc" ] |
| 446 } | 446 } |
| 447 } | 447 } |
| 448 | 448 |
| 449 source_set("sync_integration_test_support") { | 449 source_set("sync_integration_test_support") { |
| 450 testonly = true | 450 testonly = true |
| 451 sources = rebase_path(gypi_values.test_support_sync_integration_sources, | 451 sources = rebase_path( |
| 452 ".", | 452 chrome_tests_gypi_values.test_support_sync_integration_sources, |
| 453 "//chrome") | 453 ".", |
| 454 "//chrome") |
| 454 public_deps = [ | 455 public_deps = [ |
| 455 "//chrome/browser", | 456 "//chrome/browser", |
| 456 ] | 457 ] |
| 457 deps = [ | 458 deps = [ |
| 458 ":test_support", | 459 ":test_support", |
| 459 "//base", | 460 "//base", |
| 460 "//chrome", | 461 "//chrome", |
| 461 "//components/invalidation", | 462 "//components/invalidation", |
| 462 "//components/invalidation:test_support", | 463 "//components/invalidation:test_support", |
| 463 "//net", | 464 "//net", |
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 560 "//testing/gtest", | 561 "//testing/gtest", |
| 561 "//url", | 562 "//url", |
| 562 ] | 563 ] |
| 563 if (defined(invoker.deps)) { | 564 if (defined(invoker.deps)) { |
| 564 deps += invoker.deps | 565 deps += invoker.deps |
| 565 } | 566 } |
| 566 } | 567 } |
| 567 } | 568 } |
| 568 | 569 |
| 569 js2webui("browser_tests_js_webui") { | 570 js2webui("browser_tests_js_webui") { |
| 570 sources = rebase_path(gypi_values.chrome_browser_tests_webui_js_sources, | 571 sources = rebase_path( |
| 571 ".", | 572 chrome_tests_gypi_values.chrome_browser_tests_webui_js_sources, |
| 572 "//chrome") | 573 ".", |
| 574 "//chrome") |
| 573 if (is_chrome_branded) { | 575 if (is_chrome_branded) { |
| 574 # crbug.com/230471 | 576 # crbug.com/230471 |
| 575 sources -= [ "data/webui/accessibility_audit_browsertest.js" ] | 577 sources -= [ "data/webui/accessibility_audit_browsertest.js" ] |
| 576 } | 578 } |
| 577 if (!is_chromeos) { | 579 if (!is_chromeos) { |
| 578 sources -= [ | 580 sources -= [ |
| 579 "data/webui/certificate_viewer_dialog_test.js", | 581 "data/webui/certificate_viewer_dialog_test.js", |
| 580 "test/data/chromeos/oobe_webui_browsertest.js", | 582 "test/data/chromeos/oobe_webui_browsertest.js", |
| 581 ] | 583 ] |
| 582 } | 584 } |
| 583 if (!enable_app_list) { | 585 if (!enable_app_list) { |
| 584 sources -= [ "../browser/ui/webui/app_list/start_page_browsertest.js" ] | 586 sources -= [ "../browser/ui/webui/app_list/start_page_browsertest.js" ] |
| 585 } | 587 } |
| 586 if (!enable_supervised_users) { | 588 if (!enable_supervised_users) { |
| 587 sources -= | 589 sources -= |
| 588 [ "../browser/ui/webui/downloads_ui_supervised_browsertest.js" ] | 590 [ "../browser/ui/webui/downloads_ui_supervised_browsertest.js" ] |
| 589 } | 591 } |
| 590 deps = [ | 592 deps = [ |
| 591 "//skia", | 593 "//skia", |
| 592 ] | 594 ] |
| 593 } | 595 } |
| 594 } | 596 } |
| 595 | 597 |
| 596 test("browser_tests") { | 598 test("browser_tests") { |
| 597 sources = [ | 599 sources = [ |
| 598 "base/browser_tests_main.cc", | 600 "base/browser_tests_main.cc", |
| 599 ] | 601 ] |
| 600 sources += | 602 sources += |
| 601 rebase_path(gypi_values.chrome_browser_tests_sources, ".", "//chrome") | 603 rebase_path(chrome_tests_gypi_values.chrome_browser_tests_sources, |
| 602 sources += | |
| 603 rebase_path(gypi_values.chrome_browser_extensions_test_support_sources, | |
| 604 ".", | 604 ".", |
| 605 "//chrome") | 605 "//chrome") |
| 606 sources += rebase_path( |
| 607 chrome_tests_gypi_values.chrome_browser_extensions_test_support_sour
ces, |
| 608 ".", |
| 609 "//chrome") |
| 606 | 610 |
| 607 deps = [ | 611 deps = [ |
| 608 ":sync_integration_test_support", | 612 ":sync_integration_test_support", |
| 609 ":test_support", | 613 ":test_support", |
| 610 "//base", | 614 "//base", |
| 611 "//base:i18n", | 615 "//base:i18n", |
| 612 "//base/allocator", | 616 "//base/allocator", |
| 613 "//base/test:test_support", | 617 "//base/test:test_support", |
| 614 "//chrome:browser_tests_pak", | 618 "//chrome:browser_tests_pak", |
| 615 "//chrome:packed_extra_resources", | 619 "//chrome:packed_extra_resources", |
| (...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 750 if (debug_devtools) { | 754 if (debug_devtools) { |
| 751 defines += [ "DEBUG_DEVTOOLS=1" ] | 755 defines += [ "DEBUG_DEVTOOLS=1" ] |
| 752 } | 756 } |
| 753 if (use_ash) { | 757 if (use_ash) { |
| 754 deps += [ "//ash:test_support" ] | 758 deps += [ "//ash:test_support" ] |
| 755 } | 759 } |
| 756 if (use_aura || toolkit_views) { | 760 if (use_aura || toolkit_views) { |
| 757 deps += [ "//ui/events:test_support" ] | 761 deps += [ "//ui/events:test_support" ] |
| 758 } | 762 } |
| 759 if (toolkit_views) { | 763 if (toolkit_views) { |
| 760 sources += rebase_path(gypi_values.chrome_browser_tests_views_sources, | 764 sources += rebase_path( |
| 761 ".", | 765 chrome_tests_gypi_values.chrome_browser_tests_views_sources, |
| 762 "//chrome") | 766 ".", |
| 767 "//chrome") |
| 763 deps += [ "//ui/views" ] | 768 deps += [ "//ui/views" ] |
| 764 if (!is_mac) { | 769 if (!is_mac) { |
| 765 sources += | 770 sources += rebase_path( |
| 766 rebase_path(gypi_values.chrome_browser_tests_views_non_mac_sources, | 771 chrome_tests_gypi_values.chrome_browser_tests_views_non_mac_sour
ces, |
| 767 ".", | 772 ".", |
| 768 "//chrome") | 773 "//chrome") |
| 769 } | 774 } |
| 770 } | 775 } |
| 771 if (is_chromeos) { | 776 if (is_chromeos) { |
| 772 sources += rebase_path(gypi_values.chrome_browser_tests_chromeos_sources, | 777 sources += rebase_path( |
| 773 ".", | 778 chrome_tests_gypi_values.chrome_browser_tests_chromeos_sources, |
| 774 "//chrome") | 779 ".", |
| 780 "//chrome") |
| 775 sources -= [ | 781 sources -= [ |
| 776 "../../apps/load_and_launch_browsertest.cc", | 782 "../../apps/load_and_launch_browsertest.cc", |
| 777 "../browser/printing/cloud_print/test/cloud_print_policy_browsertest.cc"
, | 783 "../browser/printing/cloud_print/test/cloud_print_policy_browsertest.cc"
, |
| 778 "../browser/printing/cloud_print/test/cloud_print_proxy_process_browsert
est.cc", | 784 "../browser/printing/cloud_print/test/cloud_print_proxy_process_browsert
est.cc", |
| 779 | 785 |
| 780 # chromeos does not support profile list avatar menu | 786 # chromeos does not support profile list avatar menu |
| 781 "../browser/profiles/profile_list_desktop_browsertest.cc", | 787 "../browser/profiles/profile_list_desktop_browsertest.cc", |
| 782 "../browser/service_process/service_process_control_browsertest.cc", | 788 "../browser/service_process/service_process_control_browsertest.cc", |
| 783 | 789 |
| 784 # chromeos does not use cross-platform panels | 790 # chromeos does not use cross-platform panels |
| (...skipping 16 matching lines...) Expand all Loading... |
| 801 "../browser/invalidation/profile_invalidation_provider_factory_browserte
st.cc", | 807 "../browser/invalidation/profile_invalidation_provider_factory_browserte
st.cc", |
| 802 "../browser/net/nss_context_chromeos_browsertest.cc", | 808 "../browser/net/nss_context_chromeos_browsertest.cc", |
| 803 "../browser/ui/ash/keyboard_controller_browsertest.cc", | 809 "../browser/ui/ash/keyboard_controller_browsertest.cc", |
| 804 "data/webui/certificate_viewer_ui_test-inl.h", | 810 "data/webui/certificate_viewer_ui_test-inl.h", |
| 805 ] | 811 ] |
| 806 if (toolkit_views) { | 812 if (toolkit_views) { |
| 807 sources -= [ "../browser/ui/views/select_file_dialog_extension_browserte
st.cc" ] | 813 sources -= [ "../browser/ui/views/select_file_dialog_extension_browserte
st.cc" ] |
| 808 } | 814 } |
| 809 } | 815 } |
| 810 if (enable_configuration_policy) { | 816 if (enable_configuration_policy) { |
| 811 sources += rebase_path(gypi_values.chrome_browser_tests_policy_sources, | 817 sources += rebase_path( |
| 812 ".", | 818 chrome_tests_gypi_values.chrome_browser_tests_policy_sources, |
| 813 "//chrome") | 819 ".", |
| 820 "//chrome") |
| 814 } | 821 } |
| 815 if (enable_web_speech) { | 822 if (enable_web_speech) { |
| 816 sources += rebase_path(gypi_values.chrome_browser_tests_speech_sources, | 823 sources += rebase_path( |
| 817 ".", | 824 chrome_tests_gypi_values.chrome_browser_tests_speech_sources, |
| 818 "//chrome") | 825 ".", |
| 826 "//chrome") |
| 819 } | 827 } |
| 820 if (safe_browsing_mode == 1) { | 828 if (safe_browsing_mode == 1) { |
| 821 sources += rebase_path( | 829 sources += rebase_path( |
| 822 gypi_values.chrome_browser_tests_full_safe_browsing_sources, | 830 chrome_tests_gypi_values.chrome_browser_tests_full_safe_browsing_s
ources, |
| 823 ".", | 831 ".", |
| 824 "//chrome") | 832 "//chrome") |
| 825 defines += [ "FULL_SAFE_BROWSING" ] | 833 defines += [ "FULL_SAFE_BROWSING" ] |
| 826 } | 834 } |
| 827 if (enable_captive_portal_detection) { | 835 if (enable_captive_portal_detection) { |
| 828 sources += [ "../browser/captive_portal/captive_portal_browsertest.cc" ] | 836 sources += [ "../browser/captive_portal/captive_portal_browsertest.cc" ] |
| 829 } | 837 } |
| 830 if (!enable_webrtc) { | 838 if (!enable_webrtc) { |
| 831 sources -= [ | 839 sources -= [ |
| 832 "../browser/extensions/api/webrtc_audio_private/webrtc_audio_private_bro
wsertest.cc", | 840 "../browser/extensions/api/webrtc_audio_private/webrtc_audio_private_bro
wsertest.cc", |
| (...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 943 [ "../browser/copresence/chrome_whispernet_client_browsertest.cc" ] | 951 [ "../browser/copresence/chrome_whispernet_client_browsertest.cc" ] |
| 944 deps += [ "//components/copresence" ] | 952 deps += [ "//components/copresence" ] |
| 945 } | 953 } |
| 946 if (!is_android && !is_ios && !is_linux) { | 954 if (!is_android && !is_ios && !is_linux) { |
| 947 # NPAPI test plugin only works on some platforms. | 955 # NPAPI test plugin only works on some platforms. |
| 948 data_deps += [ | 956 data_deps += [ |
| 949 #'../content/content_shell_and_tests.gyp:copy_npapi_test_plugin', TODO(
GYP) | 957 #'../content/content_shell_and_tests.gyp:copy_npapi_test_plugin', TODO(
GYP) |
| 950 ] | 958 ] |
| 951 } | 959 } |
| 952 if (enable_app_list) { | 960 if (enable_app_list) { |
| 953 sources += rebase_path(gypi_values.chrome_browser_tests_app_list_sources, | 961 sources += rebase_path( |
| 954 ".", | 962 chrome_tests_gypi_values.chrome_browser_tests_app_list_sources, |
| 955 "//chrome") | 963 ".", |
| 964 "//chrome") |
| 956 } | 965 } |
| 957 if (enable_supervised_users) { | 966 if (enable_supervised_users) { |
| 958 sources += | 967 sources += rebase_path( |
| 959 rebase_path(gypi_values.chrome_browser_tests_supervised_user_sources, | 968 chrome_tests_gypi_values.chrome_browser_tests_supervised_user_sour
ces, |
| 960 ".", | 969 ".", |
| 961 "//chrome") | 970 "//chrome") |
| 962 } | 971 } |
| 963 if (enable_pepper_cdms) { | 972 if (enable_pepper_cdms) { |
| 964 # Runtime dependencies. | 973 # Runtime dependencies. |
| 965 data_deps += [ | 974 data_deps += [ |
| 966 "//media/cdm/ppapi:clearkeycdmadapter", | 975 "//media/cdm/ppapi:clearkeycdmadapter", |
| 967 "//third_party/widevine/cdm:adapter", | 976 "//third_party/widevine/cdm:adapter", |
| 968 ] | 977 ] |
| 969 } | 978 } |
| 970 if (!enable_print_preview) { | 979 if (!enable_print_preview) { |
| 971 sources -= [ | 980 sources -= [ |
| (...skipping 30 matching lines...) Expand all Loading... |
| 1002 deps -= [ "//third_party/libaddressinput" ] | 1011 deps -= [ "//third_party/libaddressinput" ] |
| 1003 } | 1012 } |
| 1004 if (use_ozone) { | 1013 if (use_ozone) { |
| 1005 sources -= [ | 1014 sources -= [ |
| 1006 # crbug.com/362698 | 1015 # crbug.com/362698 |
| 1007 "../browser/chromeos/input_method/input_method_engine_browsertests.cc", | 1016 "../browser/chromeos/input_method/input_method_engine_browsertests.cc", |
| 1008 "../browser/extensions/api/input_ime/input_ime_apitest_chromeos.cc", | 1017 "../browser/extensions/api/input_ime/input_ime_apitest_chromeos.cc", |
| 1009 ] | 1018 ] |
| 1010 } | 1019 } |
| 1011 if (enable_remoting) { | 1020 if (enable_remoting) { |
| 1012 sources += rebase_path(gypi_values.chrome_browser_tests_remoting_sources, | 1021 sources += rebase_path( |
| 1013 ".", | 1022 chrome_tests_gypi_values.chrome_browser_tests_remoting_sources, |
| 1014 "//chrome") | 1023 ".", |
| 1024 "//chrome") |
| 1015 #deps += [ "//remoting:remoting_webapp" ] TODO(GYP) | 1025 #deps += [ "//remoting:remoting_webapp" ] TODO(GYP) |
| 1016 } | 1026 } |
| 1017 if (use_x11) { | 1027 if (use_x11) { |
| 1018 deps += [ "//tools/xdisplaycheck" ] | 1028 deps += [ "//tools/xdisplaycheck" ] |
| 1019 } | 1029 } |
| 1020 } | 1030 } |
| 1021 | 1031 |
| 1022 test("sync_integration_tests") { | 1032 test("sync_integration_tests") { |
| 1023 sources = | 1033 sources = |
| 1024 rebase_path(gypi_values.sync_integration_tests_sources, ".", "//chrome") | 1034 rebase_path(chrome_tests_gypi_values.sync_integration_tests_sources, |
| 1035 ".", |
| 1036 "//chrome") |
| 1025 | 1037 |
| 1026 # TODO(phajdan.jr): Only temporary, to make transition easier. | 1038 # TODO(phajdan.jr): Only temporary, to make transition easier. |
| 1027 defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ] | 1039 defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ] |
| 1028 | 1040 |
| 1029 deps = [ | 1041 deps = [ |
| 1030 ":sync_integration_test_support", | 1042 ":sync_integration_test_support", |
| 1031 ":test_support", | 1043 ":test_support", |
| 1032 "//base/allocator", | 1044 "//base/allocator", |
| 1033 "//chrome:packed_extra_resources", | 1045 "//chrome:packed_extra_resources", |
| 1034 "//chrome:packed_resources", | 1046 "//chrome:packed_resources", |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1092 "../browser/sync/test/integration/two_client_app_list_sync_test.cc", | 1104 "../browser/sync/test/integration/two_client_app_list_sync_test.cc", |
| 1093 ] | 1105 ] |
| 1094 } | 1106 } |
| 1095 if (!enable_supervised_users) { | 1107 if (!enable_supervised_users) { |
| 1096 sources -= [ "../browser/sync/test/integration/single_client_supervised_us
er_settings_sync_test.cc" ] | 1108 sources -= [ "../browser/sync/test/integration/single_client_supervised_us
er_settings_sync_test.cc" ] |
| 1097 } | 1109 } |
| 1098 } | 1110 } |
| 1099 | 1111 |
| 1100 test("sync_performance_tests") { | 1112 test("sync_performance_tests") { |
| 1101 sources = | 1113 sources = |
| 1102 rebase_path(gypi_values.sync_performance_tests_sources, ".", "//chrome") | 1114 rebase_path(chrome_tests_gypi_values.sync_performance_tests_sources, |
| 1115 ".", |
| 1116 "//chrome") |
| 1103 | 1117 |
| 1104 defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ] | 1118 defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ] |
| 1105 | 1119 |
| 1106 deps = [ | 1120 deps = [ |
| 1107 ":sync_integration_test_support", | 1121 ":sync_integration_test_support", |
| 1108 "//base/allocator", | 1122 "//base/allocator", |
| 1109 "//crypto:platform", | 1123 "//crypto:platform", |
| 1110 "//sync", | 1124 "//sync", |
| 1111 "//testing/gmock", | 1125 "//testing/gmock", |
| 1112 "//testing/gtest", | 1126 "//testing/gtest", |
| (...skipping 553 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1666 } | 1680 } |
| 1667 if (use_ozone) { | 1681 if (use_ozone) { |
| 1668 # crbug.com/354036 | 1682 # crbug.com/354036 |
| 1669 sources -= [ "../browser/chromeos/events/event_rewriter_unittest.cc" ] | 1683 sources -= [ "../browser/chromeos/events/event_rewriter_unittest.cc" ] |
| 1670 } | 1684 } |
| 1671 if (!enable_plugin_installation) { | 1685 if (!enable_plugin_installation) { |
| 1672 sources -= [ "../browser/plugins/plugin_installer_unittest.cc" ] | 1686 sources -= [ "../browser/plugins/plugin_installer_unittest.cc" ] |
| 1673 } | 1687 } |
| 1674 } | 1688 } |
| 1675 } | 1689 } |
| OLD | NEW |