Skip to content

GitLab

T
tangled
Commit 57c96393 authored by Wez's avatar Wez Committed by Commit Bot
Browse files
Options

Switch Fuchsia builders to use 'gn_all' in 'additional_compile_targets'. 

Previously the targets to be compiled (but not run) were specified
explicitly, effectively duplicating the logic already present in the GN
build configuration files.

Bug: 707031
Change-Id: I8c6715f9f862a04a49c81030ba9d0212f0468ec9
Reviewed-on: https://chromium-review.googlesource.com/802189
Commit-Queue: Wez <wez@chromium.org>
Reviewed-by: default avatarJohn Budorick <jbudorick@chromium.org>
Reviewed-by: default avatarDirk Pranke <dpranke@chromium.org>
Reviewed-by: default avatarScott Graham <scottmg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#521856}
parent 061ef694
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 115 deletions
BUILD.gn
View file @ 57c96393
......@@ -159,13 +159,28 @@ group("gn_all") {
if (!is_ios) {
deps += [
"//cc:cc_unittests",
"//components/policy:policy_templates",
"//content/shell:content_shell",
"//content/test:content_browsertests",
"//content/test:content_perftests",
"//content/test:content_unittests",
"//gpu:gpu_unittests",
"//gpu/ipc/service:gpu_ipc_service_unittests",
"//ipc:ipc_tests",
"//media:media_unittests",
"//media/midi:midi_unittests",
"//media/mojo:media_mojo_unittests",
"//mojo",
"//mojo/common:mojo_common_unittests",
"//mojo/edk/system:mojo_system_unittests",
"//mojo/edk/test:mojo_public_bindings_unittests",
"//mojo/edk/test:mojo_public_system_unittests",
"//net:net_perftests",
"//third_party/WebKit/Source/controller:webkit_unit_tests",
"//third_party/WebKit/Source/platform/wtf:wtf_unittests",
"//ui/gl:gl_unittests",
"//url/ipc:url_ipc_unittests",
]
}
......@@ -178,38 +193,19 @@ group("gn_all") {
if (!is_ios && !is_fuchsia) {
deps += [
"//cc:cc_unittests",
"//chrome/test:telemetry_perf_unittests",
"//chrome/test:unit_tests",
"//components:components_browsertests",
"//components/policy:policy_templates",
"//components/viz:viz_perftests",
"//components/viz:viz_unittests",
"//components/viz/common:viz_benchmark",
"//content/shell:content_shell",
"//content/test:content_browsertests",
"//content/test:content_perftests",
"//content/test:content_unittests",
"//device:device_unittests",
"//google_apis/gcm:mcs_probe",
"//gpu:gpu_unittests",
"//gpu/ipc/service:gpu_ipc_service_unittests",
"//ipc:ipc_tests",
"//media/capture:capture_unittests",
"//media/cast:cast_unittests",
"//media/midi:midi_unittests",
"//media/mojo:media_mojo_unittests",
"//mojo",
"//mojo/common:mojo_common_unittests",
"//mojo/edk/system:mojo_system_unittests",
"//mojo/edk/test:mojo_public_bindings_unittests",
"//mojo/edk/test:mojo_public_system_unittests",
"//net:net_perftests",
"//storage:storage_unittests",
"//third_party/WebKit/Source/controller:webkit_unit_tests",
"//third_party/WebKit/Source/platform:blink_platform_unittests",
"//third_party/WebKit/Source/platform/heap:blink_heap_unittests",
"//third_party/WebKit/Source/platform/wtf:wtf_unittests",
"//third_party/angle/src/tests:angle_end2end_tests",
"//third_party/angle/src/tests:angle_unittests",
"//third_party/angle/src/tests:angle_white_box_tests",
......@@ -220,7 +216,6 @@ group("gn_all") {
"//ui/events:events_unittests",
"//ui/latency:latency_unittests",
"//ui/touch_selection:ui_touch_selection_unittests",
"//url/ipc:url_ipc_unittests",
"//v8:gn_all",
]
} else if (is_ios) {
......@@ -263,9 +258,15 @@ group("gn_all") {
deps += [
"//ui/ozone",
"//ui/ozone:ozone_unittests",
"//ui/ozone/demo",
"//ui/ozone/gl:ozone_gl_unittests",
]
# TODO(crbug.com/766360): These require a working GL implementation.
if (!is_fuchsia) {
deps += [
"//ui/ozone/demo",
"//ui/ozone/gl:ozone_gl_unittests",
]
}
}
if (use_x11 || ozone_platform_x11) {
......@@ -734,7 +735,11 @@ group("gn_all") {
}
if (is_fuchsia) {
deps += [ "//headless" ]
deps += [
"//headless",
"//headless:headless_shell",
"//headless:headless_tests",
]
}
}
......
testing/buildbot/chromium.fyi.json
View file @ 57c96393
......@@ -3869,11 +3869,7 @@
},
"Fuchsia": {
"additional_compile_targets": [
"content_browsertests",
"content_shell",
"gl_unittests",
"headless_shell",
"webkit_unit_tests"
"gn_all"
],
"gtest_tests": [
{
......@@ -4070,13 +4066,7 @@
},
"Fuchsia (dbg)": {
"additional_compile_targets": [
"content_browsertests",
"content_shell",
"content_unittests",
"gl_unittests",
"media_unittests",
"net_unittests",
"webkit_unit_tests"
"gn_all"
],
"gtest_tests": [
{
......@@ -4244,14 +4234,7 @@
},
"Fuchsia ARM64": {
"additional_compile_targets": [
"content_browsertests",
"content_shell",
"content_unittests",
"gl_unittests",
"headless_shell",
"media_unittests",
"net_unittests",
"webkit_unit_tests"
"gn_all"
],
"gtest_tests": [
{
......
testing/buildbot/chromium.linux.json
View file @ 57c96393
......@@ -379,24 +379,7 @@
},
"Fuchsia ARM64": {
"additional_compile_targets": [
"base_unittests",
"content_unittests",
"crypto_unittests",
"gl_unittests",
"headless_shell",
"ipc_tests",
"media_unittests",
"mojo_common_unittests",
"mojo_js_unittests",
"mojo_public_bindings_unittests",
"mojo_public_system_unittests",
"mojo_system_unittests",
"net_unittests",
"service_manager_unittests",
"skia_unittests",
"sql_unittests",
"ui_base_unittests",
"webkit_unit_tests"
"gn_all"
]
},
"Fuchsia ARM64 Cast Audio": {
......@@ -407,22 +390,7 @@
},
"Fuchsia x64": {
"additional_compile_targets": [
"base_unittests",
"content_browsertests",
"content_shell",
"gl_unittests",
"headless_shell",
"ipc_tests",
"media_unittests",
"mojo_common_unittests",
"mojo_js_unittests",
"mojo_public_bindings_unittests",
"mojo_public_system_unittests",
"mojo_system_unittests",
"net_unittests",
"service_manager_unittests",
"ui_base_unittests",
"webkit_unit_tests"
"gn_all"
],
"gtest_tests": [
{
......
testing/buildbot/gn_isolate_map.pyl
View file @ 57c96393
......@@ -387,10 +387,6 @@
"label": "//content/public/android:content_junit_tests",
"type": "junit_test",
},
"content_shell": {
"label": "//content/shell:content_shell",
"type": "raw",
},
"content_shell_crash_test": {
"label": "//content/shell:content_shell_crash_test",
"type": "script",
......@@ -531,6 +527,10 @@
"type": "windowed_test_launcher",
"executable": "gl_unittests",
},
"gn_all": {
"label": "//:gn_all",
"type": "additional_compile_target",
},
"gn_unittests": {
"label": "//tools/gn:gn_unittests",
"type": "console_test_launcher",
......
testing/buildbot/waterfalls.pyl
View file @ 57c96393
......@@ -293,24 +293,7 @@
'machines': {
'Fuchsia ARM64': {
'additional_compile_targets': [
'base_unittests',
'content_unittests',
'crypto_unittests',
'gl_unittests',
'headless_shell',
'ipc_tests',
'media_unittests',
'mojo_common_unittests',
'mojo_js_unittests',
'mojo_public_bindings_unittests',
'mojo_public_system_unittests',
'mojo_system_unittests',
'net_unittests',
'service_manager_unittests',
'skia_unittests',
'sql_unittests',
'ui_base_unittests',
'webkit_unit_tests',
'gn_all',
],
},
'Fuchsia ARM64 Cast Audio': {
......@@ -364,22 +347,7 @@
},
'Fuchsia x64': {
'additional_compile_targets': [
'base_unittests',
'content_browsertests',
'content_shell',
'gl_unittests',
'headless_shell',
'ipc_tests',
'media_unittests',
'mojo_common_unittests',
'mojo_js_unittests',
'mojo_public_bindings_unittests',
'mojo_public_system_unittests',
'mojo_system_unittests',
'net_unittests',
'service_manager_unittests',
'ui_base_unittests',
'webkit_unit_tests',
'gn_all',
],
'swarming': {
'dimension_sets': [
......
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