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

Side by Side Diff: chrome/test/BUILD.gn

Issue 2210573002: browser_test: Add a browser_tests_runner target for running tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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 unified diff | Download patch
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 847 matching lines...) Expand 10 before | Expand all | Expand 10 after
858 testonly = true 858 testonly = true
859 data = [ 859 data = [
860 "//testing/buildbot/filters/mojo.fyi.browser_tests.filter", 860 "//testing/buildbot/filters/mojo.fyi.browser_tests.filter",
861 ] 861 ]
862 data_deps = [ 862 data_deps = [
863 ":browser_tests", 863 ":browser_tests",
864 ] 864 ]
865 } 865 }
866 } 866 }
867 867
868 static_library("browser_tests_runner") {
869 testonly = true
870 sources = [
871 "base/browser_tests_main.cc",
872 ]
873
874 deps = [
875 ":test_support",
876 ]
877
878 if (use_aura) {
879 sources += [
880 "base/mash_browser_tests_main.cc",
881 "base/mash_browser_tests_main.h",
882 "base/mojo_test_connector.cc",
883 "base/mojo_test_connector.h",
884 ]
885
886 deps += [
887 "//services/shell/background:lib",
888 "//services/shell/background/tests:test_support",
889 ]
890
891 data_deps = [
892 "//chrome/app:mojo_manifests",
893 "//mash/session",
894 ]
895
896 defines = [ "MOJO_SHELL_CLIENT" ]
897 }
898 }
899
868 test("browser_tests") { 900 test("browser_tests") {
869 sources = [ 901 sources = rebase_path(chrome_tests_gypi_values.chrome_browser_tests_sources,
870 "base/browser_tests_main.cc", 902 ".",
871 ] 903 "//chrome")
872 sources += rebase_path(chrome_tests_gypi_values.chrome_browser_tests_sources,
873 ".",
874 "//chrome")
875 904
876 configs += [ 905 configs += [
877 "//build/config:precompiled_headers", 906 "//build/config:precompiled_headers",
878 "//third_party/WebKit/public:debug_devtools", 907 "//third_party/WebKit/public:debug_devtools",
879 ] 908 ]
880 909
881 deps = [ 910 deps = [
911 ":browser_tests_runner",
882 ":test_support", 912 ":test_support",
883 "//base", 913 "//base",
884 "//components/sync:test_support_sync_api", 914 "//components/sync:test_support_sync_api",
885 ] 915 ]
886 916
887 data_deps = [] 917 data_deps = []
888 918
889 data = [] 919 data = []
890 920
891 defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ] 921 defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
(...skipping 579 matching lines...) Expand 10 before | Expand all | Expand 10 after
1471 chrome_tests_gypi_values.chrome_browser_tests_remoting_sources, 1501 chrome_tests_gypi_values.chrome_browser_tests_remoting_sources,
1472 ".", 1502 ".",
1473 "//chrome") 1503 "//chrome")
1474 deps += [ "//remoting/webapp" ] 1504 deps += [ "//remoting/webapp" ]
1475 } 1505 }
1476 if (use_x11) { 1506 if (use_x11) {
1477 deps += [ "//tools/xdisplaycheck" ] 1507 deps += [ "//tools/xdisplaycheck" ]
1478 } 1508 }
1479 1509
1480 if (use_aura) { 1510 if (use_aura) {
1481 sources += [
1482 "base/mash_browser_tests_main.cc",
1483 "base/mash_browser_tests_main.h",
1484 "base/mojo_test_connector.cc",
1485 "base/mojo_test_connector.h",
1486 ]
1487
1488 deps += [
1489 "//services/shell/background:lib",
1490 "//services/shell/background/tests:test_support",
1491 ]
1492
1493 data_deps += [
1494 "//chrome/app:mojo_manifests",
1495 "//mash/session",
1496 ]
1497
1498 defines += [ "MOJO_SHELL_CLIENT" ]
1499
1500 if (enable_wifi_display) { 1511 if (enable_wifi_display) {
1501 sources += rebase_path( 1512 sources += rebase_path(
1502 chrome_tests_gypi_values.chrome_browser_tests_display_source_api test, 1513 chrome_tests_gypi_values.chrome_browser_tests_display_source_api test,
1503 ".", 1514 ".",
1504 "//chrome") 1515 "//chrome")
1505 } 1516 }
1506 } 1517 }
1507 } 1518 }
1508 } 1519 }
1509 1520
(...skipping 19 matching lines...) Expand all
1529 "$root_out_dir/chrome_100_percent.pak", 1540 "$root_out_dir/chrome_100_percent.pak",
1530 "$root_out_dir/chrome_200_percent.pak", 1541 "$root_out_dir/chrome_200_percent.pak",
1531 "$root_out_dir/locales/en-US.pak", 1542 "$root_out_dir/locales/en-US.pak",
1532 ] 1543 ]
1533 } 1544 }
1534 1545
1535 # TODO(phajdan.jr): Only temporary, to make transition easier. 1546 # TODO(phajdan.jr): Only temporary, to make transition easier.
1536 defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ] 1547 defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
1537 1548
1538 deps = [ 1549 deps = [
1550 ":browser_tests_runner",
1539 ":sync_integration_test_support", 1551 ":sync_integration_test_support",
1540 ":test_support", 1552 ":test_support",
1541 ":test_support_ui", 1553 ":test_support_ui",
1542 "//chrome:packed_extra_resources", 1554 "//chrome:packed_extra_resources",
1543 "//chrome:packed_resources", 1555 "//chrome:packed_resources",
1544 "//chrome:resources", 1556 "//chrome:resources",
1545 "//chrome:strings", 1557 "//chrome:strings",
1546 "//chrome/app:command_ids", 1558 "//chrome/app:command_ids",
1547 "//chrome/common", 1559 "//chrome/common",
1548 "//chrome/renderer", 1560 "//chrome/renderer",
(...skipping 925 matching lines...) Expand 10 before | Expand all | Expand 10 after
2474 if (is_android) { 2486 if (is_android) {
2475 android_library("unit_tests_java") { 2487 android_library("unit_tests_java") {
2476 java_files = [ "android/unit_tests_apk/src/org/chromium/chrome/unit_tests_ap k/ChromeNativeTestApplication.java" ] 2488 java_files = [ "android/unit_tests_apk/src/org/chromium/chrome/unit_tests_ap k/ChromeNativeTestApplication.java" ]
2477 deps = [ 2489 deps = [
2478 "//base:base_java", 2490 "//base:base_java",
2479 "//chrome/android:chrome_java", 2491 "//chrome/android:chrome_java",
2480 "//content/public/android:content_java", 2492 "//content/public/android:content_java",
2481 ] 2493 ]
2482 } 2494 }
2483 } 2495 }
OLDNEW
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698