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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/test/BUILD.gn

Issue 963063002: Revert of Add chrome driver to the GN build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@test_audit
Patch Set: Created 5 years, 10 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') | chrome/test/chromedriver/BUILD.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 708205118c407c4aae9e0b1751dd0ededea6c6fe..692e3ef8707be79884010c4a46125bb1ce71a2fd 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -216,13 +216,15 @@
}
if (!is_android && (!is_win || link_chrome_on_windows)) {
- import("//chrome/chrome_tests.gni")
+ gypi_values = exec_script("//build/gypi_to_gn.py",
+ [ rebase_path("../chrome_tests.gypi") ],
+ "scope",
+ [ "../chrome_tests.gypi" ])
test("interactive_ui_tests") {
- sources =
- rebase_path(chrome_tests_gypi_values.chrome_interactive_ui_test_sources,
- ".",
- "//chrome")
+ sources = rebase_path(gypi_values.chrome_interactive_ui_test_sources,
+ ".",
+ "//chrome")
defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
ldflags = []
@@ -265,10 +267,10 @@
]
if (toolkit_views) {
- sources += rebase_path(
- chrome_tests_gypi_values.chrome_interactive_ui_test_views_sources,
- ".",
- "//chrome")
+ sources +=
+ rebase_path(gypi_values.chrome_interactive_ui_test_views_sources,
+ ".",
+ "//chrome")
deps += [
"//ui/views",
"//ui/views:test_support",
@@ -276,7 +278,7 @@
]
if (!is_mac) {
sources += rebase_path(
- chrome_tests_gypi_values.chrome_interactive_ui_test_views_non_mac_sources,
+ gypi_values.chrome_interactive_ui_test_views_non_mac_sources,
".",
"//chrome")
}
@@ -304,16 +306,16 @@
} else {
# Everything but desktop Linux.
sources += rebase_path(
- chrome_tests_gypi_values.chrome_interactive_ui_test_non_desktop_linux_sources,
+ gypi_values.chrome_interactive_ui_test_non_desktop_linux_sources,
".",
"//chrome")
}
if (is_chromeos) {
- sources += rebase_path(
- chrome_tests_gypi_values.chrome_interactive_ui_test_chromeos_sources,
- ".",
- "//chrome")
+ sources +=
+ rebase_path(gypi_values.chrome_interactive_ui_test_chromeos_sources,
+ ".",
+ "//chrome")
sources += [ "../browser/notifications/login_state_notification_blocker_chromeos_browsertest.cc" ]
sources -= [
# Use only the _chromeos version on ChromeOS.
@@ -342,15 +344,15 @@
}
} else {
# ChromeOS doesn't use panels, everybody else does.
- sources += rebase_path(
- chrome_tests_gypi_values.chrome_interactive_ui_test_panels_sources,
- ".",
- "//chrome")
+ sources +=
+ rebase_path(gypi_values.chrome_interactive_ui_test_panels_sources,
+ ".",
+ "//chrome")
# TODO(tapted): Include on mac when views panels are ported.
if (toolkit_views && !is_mac) {
sources += rebase_path(
- chrome_tests_gypi_values.chrome_interactive_ui_test_panels_views_sources,
+ gypi_values.chrome_interactive_ui_test_panels_views_sources,
".",
"//chrome")
}
@@ -359,16 +361,15 @@
if (!is_linux) {
# Non-Linux platforms (Linux includes ChromeOS here).
sources += rebase_path(
- chrome_tests_gypi_values.chrome_interactive_ui_test_non_linux_and_chromeos_sources,
+ gypi_values.chrome_interactive_ui_test_non_linux_and_chromeos_sources,
".",
"//chrome")
}
if (is_win) {
- sources += rebase_path(
- chrome_tests_gypi_values.chrome_interactive_ui_test_win_sources,
- ".",
- "//chrome")
+ sources += rebase_path(gypi_values.chrome_interactive_ui_test_win_sources,
+ ".",
+ "//chrome")
sources += [ "$root_gen_dir/chrome/other_version.rc" ]
deps += [
"//chrome:chrome_version_resources",
@@ -399,23 +400,22 @@
}
if (enable_app_list) {
- sources += rebase_path(
- chrome_tests_gypi_values.chrome_interactive_ui_test_app_list_sources,
- ".",
- "//chrome")
+ sources +=
+ rebase_path(gypi_values.chrome_interactive_ui_test_app_list_sources,
+ ".",
+ "//chrome")
}
if (use_ash) {
- sources += rebase_path(
- chrome_tests_gypi_values.chrome_interactive_ui_test_ash_sources,
- ".",
- "//chrome")
+ sources += rebase_path(gypi_values.chrome_interactive_ui_test_ash_sources,
+ ".",
+ "//chrome")
deps += [ "//ash:test_support" ]
}
if (enable_notifications) {
sources += rebase_path(
- chrome_tests_gypi_values.chrome_interactive_ui_test_notifications_sources,
+ gypi_values.chrome_interactive_ui_test_notifications_sources,
".",
"//chrome")
@@ -448,10 +448,9 @@
source_set("sync_integration_test_support") {
testonly = true
- sources = rebase_path(
- chrome_tests_gypi_values.test_support_sync_integration_sources,
- ".",
- "//chrome")
+ sources = rebase_path(gypi_values.test_support_sync_integration_sources,
+ ".",
+ "//chrome")
public_deps = [
"//chrome/browser",
]
@@ -568,10 +567,9 @@
}
js2webui("browser_tests_js_webui") {
- sources = rebase_path(
- chrome_tests_gypi_values.chrome_browser_tests_webui_js_sources,
- ".",
- "//chrome")
+ sources = rebase_path(gypi_values.chrome_browser_tests_webui_js_sources,
+ ".",
+ "//chrome")
if (is_chrome_branded) {
# crbug.com/230471
sources -= [ "data/webui/accessibility_audit_browsertest.js" ]
@@ -600,13 +598,11 @@
"base/browser_tests_main.cc",
]
sources +=
- rebase_path(chrome_tests_gypi_values.chrome_browser_tests_sources,
+ rebase_path(gypi_values.chrome_browser_tests_sources, ".", "//chrome")
+ sources +=
+ rebase_path(gypi_values.chrome_browser_extensions_test_support_sources,
".",
"//chrome")
- sources += rebase_path(
- chrome_tests_gypi_values.chrome_browser_extensions_test_support_sources,
- ".",
- "//chrome")
deps = [
":sync_integration_test_support",
@@ -761,23 +757,21 @@
deps += [ "//ui/events:test_support" ]
}
if (toolkit_views) {
- sources += rebase_path(
- chrome_tests_gypi_values.chrome_browser_tests_views_sources,
- ".",
- "//chrome")
+ sources += rebase_path(gypi_values.chrome_browser_tests_views_sources,
+ ".",
+ "//chrome")
deps += [ "//ui/views" ]
if (!is_mac) {
- sources += rebase_path(
- chrome_tests_gypi_values.chrome_browser_tests_views_non_mac_sources,
- ".",
- "//chrome")
+ sources +=
+ rebase_path(gypi_values.chrome_browser_tests_views_non_mac_sources,
+ ".",
+ "//chrome")
}
}
if (is_chromeos) {
- sources += rebase_path(
- chrome_tests_gypi_values.chrome_browser_tests_chromeos_sources,
- ".",
- "//chrome")
+ sources += rebase_path(gypi_values.chrome_browser_tests_chromeos_sources,
+ ".",
+ "//chrome")
sources -= [
"../../apps/load_and_launch_browsertest.cc",
"../browser/printing/cloud_print/test/cloud_print_policy_browsertest.cc",
@@ -814,20 +808,18 @@
}
}
if (enable_configuration_policy) {
- sources += rebase_path(
- chrome_tests_gypi_values.chrome_browser_tests_policy_sources,
- ".",
- "//chrome")
+ sources += rebase_path(gypi_values.chrome_browser_tests_policy_sources,
+ ".",
+ "//chrome")
}
if (enable_web_speech) {
- sources += rebase_path(
- chrome_tests_gypi_values.chrome_browser_tests_speech_sources,
- ".",
- "//chrome")
+ sources += rebase_path(gypi_values.chrome_browser_tests_speech_sources,
+ ".",
+ "//chrome")
}
if (safe_browsing_mode == 1) {
sources += rebase_path(
- chrome_tests_gypi_values.chrome_browser_tests_full_safe_browsing_sources,
+ gypi_values.chrome_browser_tests_full_safe_browsing_sources,
".",
"//chrome")
defines += [ "FULL_SAFE_BROWSING" ]
@@ -958,16 +950,15 @@
]
}
if (enable_app_list) {
- sources += rebase_path(
- chrome_tests_gypi_values.chrome_browser_tests_app_list_sources,
- ".",
- "//chrome")
+ sources += rebase_path(gypi_values.chrome_browser_tests_app_list_sources,
+ ".",
+ "//chrome")
}
if (enable_supervised_users) {
- sources += rebase_path(
- chrome_tests_gypi_values.chrome_browser_tests_supervised_user_sources,
- ".",
- "//chrome")
+ sources +=
+ rebase_path(gypi_values.chrome_browser_tests_supervised_user_sources,
+ ".",
+ "//chrome")
}
if (enable_pepper_cdms) {
# Runtime dependencies.
@@ -1018,10 +1009,9 @@
]
}
if (enable_remoting) {
- sources += rebase_path(
- chrome_tests_gypi_values.chrome_browser_tests_remoting_sources,
- ".",
- "//chrome")
+ sources += rebase_path(gypi_values.chrome_browser_tests_remoting_sources,
+ ".",
+ "//chrome")
#deps += [ "//remoting:remoting_webapp" ] TODO(GYP)
}
if (use_x11) {
@@ -1031,9 +1021,7 @@
test("sync_integration_tests") {
sources =
- rebase_path(chrome_tests_gypi_values.sync_integration_tests_sources,
- ".",
- "//chrome")
+ rebase_path(gypi_values.sync_integration_tests_sources, ".", "//chrome")
# TODO(phajdan.jr): Only temporary, to make transition easier.
defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
@@ -1111,9 +1099,7 @@
test("sync_performance_tests") {
sources =
- rebase_path(chrome_tests_gypi_values.sync_performance_tests_sources,
- ".",
- "//chrome")
+ rebase_path(gypi_values.sync_performance_tests_sources, ".", "//chrome")
defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | chrome/test/chromedriver/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698