Commit 4b71043b authored by Chong Gu's avatar Chong Gu Committed by Commit Bot

[Fuchsia] Create gpu_integration_test target for Fuchsia.

Move telemetry_gpu_integration_test_scripts_only out of chrome.
Add fuchsia_telemetry_gpu_integration_test target.
Make telemetry_chrome_test_without_chrome not dependent on //chrome, since Fuchsia doesn't use //chrome.

Bug: 1058255
Change-Id: I02d560b769c716c4d2554168a9660d2b096289b2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2097243
Commit-Queue: Chong Gu <chonggu@google.com>
Reviewed-by: default avatarCaleb Rouleau <crouleau@chromium.org>
Reviewed-by: default avatarBrian Sheedy <bsheedy@chromium.org>
Reviewed-by: default avatarKenneth Russell <kbr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#749292}
parent d3cbcc39
...@@ -459,15 +459,6 @@ group("telemetry_gpu_integration_test") { ...@@ -459,15 +459,6 @@ group("telemetry_gpu_integration_test") {
} }
} }
group("telemetry_gpu_integration_test_scripts_only") {
testonly = true
deps = [
"//tools/perf/chrome_telemetry_build:telemetry_chrome_test_without_chrome",
]
data = [ "//content/test/gpu/" ]
}
if (is_win) { if (is_win) {
source_set("credential_provider_test_utils") { source_set("credential_provider_test_utils") {
testonly = true testonly = true
......
...@@ -581,6 +581,28 @@ jumbo_static_library("test_support") { ...@@ -581,6 +581,28 @@ jumbo_static_library("test_support") {
} }
} }
# Fuchsia gpu integration tests use web_engine and a browser like shell
# instead of an actual browser, so Fuchsia needs a separate target.
if (is_fuchsia) {
group("fuchsia_telemetry_gpu_integration_test") {
testonly = true
deps = [
"//fuchsia/engine:web_engine_runner",
"//fuchsia/engine:web_engine_shell",
"//tools/perf/chrome_telemetry_build:telemetry_chrome_test_without_chrome",
]
}
}
group("telemetry_gpu_integration_test_scripts_only") {
testonly = true
deps = [
"//tools/perf/chrome_telemetry_build:telemetry_chrome_test_without_chrome",
]
data = [ "//content/test/gpu/" ]
}
# browsertest_support can be used by targets that run content_shell based # browsertest_support can be used by targets that run content_shell based
# browser tests. # browser tests.
jumbo_static_library("browsertest_support") { jumbo_static_library("browsertest_support") {
......
...@@ -83,8 +83,13 @@ group("perf_without_chrome") { ...@@ -83,8 +83,13 @@ group("perf_without_chrome") {
"//build/android/pylib/", "//build/android/pylib/",
] ]
data_deps = []
# Runs a script which generates the ad tagging ruleset. # Runs a script which generates the ad tagging ruleset.
if (!is_ios) { if (!is_ios) {
data_deps = [ "//components/subresource_filter/tools:index_ruleset" ] data_deps += [ "//components/subresource_filter/tools:index_ruleset" ]
}
if (is_android) {
data_deps += [ "//chrome/android/webapk/shell_apk:maps_go_webapk" ]
} }
} }
...@@ -25,6 +25,7 @@ group("telemetry_chrome_test") { ...@@ -25,6 +25,7 @@ group("telemetry_chrome_test") {
":telemetry_weblayer_apks", ":telemetry_weblayer_apks",
"//android_webview/test:webview_instrumentation_apk", "//android_webview/test:webview_instrumentation_apk",
"//chrome/android:chrome_public_apk", "//chrome/android:chrome_public_apk",
"//chrome/android/webapk/shell_apk:maps_go_webapk",
] ]
if (enable_chrome_android_internal) { if (enable_chrome_android_internal) {
...@@ -38,7 +39,7 @@ group("telemetry_chrome_test") { ...@@ -38,7 +39,7 @@ group("telemetry_chrome_test") {
"//chrome/android:monochrome_public_bundle", "//chrome/android:monochrome_public_bundle",
] ]
} }
} else { } else if (!is_fuchsia) {
data_deps += [ "//chrome" ] data_deps += [ "//chrome" ]
} }
...@@ -106,7 +107,8 @@ group("telemetry_chrome_test_without_chrome") { ...@@ -106,7 +107,8 @@ group("telemetry_chrome_test_without_chrome") {
"//tools/metrics:metrics_python_tests", "//tools/metrics:metrics_python_tests",
] ]
if (!is_win) { # Cr-Fuchsia doesn't support breakpad.
if (!is_win && !is_fuchsia) {
data_deps += [ data_deps += [
# This is defined for Windows, but is unused by Telemetry on # This is defined for Windows, but is unused by Telemetry on
# Windows, and including it can have issues when cross-compiling # Windows, and including it can have issues when cross-compiling
...@@ -130,9 +132,8 @@ group("telemetry_chrome_test_without_chrome") { ...@@ -130,9 +132,8 @@ group("telemetry_chrome_test_without_chrome") {
data_deps += [ data_deps += [
"//build/android:devil_chromium_py", "//build/android:devil_chromium_py",
"//build/android:stack_tools", "//build/android:stack_tools",
"//chrome/android/webapk/shell_apk:maps_go_webapk",
] ]
} else { } else if (!is_fuchsia) {
data_deps += [ "//third_party/catapult/telemetry:bitmaptools" ] data_deps += [ "//third_party/catapult/telemetry:bitmaptools" ]
} }
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment