Commit c01be60e authored by Eric Seckler's avatar Eric Seckler Committed by Commit Bot

perfetto: Build on Fuchsia

perfetto_unittests and content_unittests seem to be passing. Other test
suites (content_browsertests / services_unittests) aren't currently
supported on Fuchsia so can't yet verify that everything works in
practice.

Depends on aosp/853409 and aosp/859117.

Bug: 916074
Change-Id: I6d7c034fdf9e3086e08b6a1338e78f75a1c86afd
Reviewed-on: https://chromium-review.googlesource.com/c/1382134Reviewed-by: default avatarDirk Pranke <dpranke@chromium.org>
Reviewed-by: default avataroysteine <oysteine@chromium.org>
Reviewed-by: default avatarSami Kyöstilä <skyostil@chromium.org>
Commit-Queue: Eric Seckler <eseckler@chromium.org>
Cr-Commit-Position: refs/heads/master@{#619606}
parent ef0f18f9
...@@ -664,7 +664,7 @@ group("gn_all") { ...@@ -664,7 +664,7 @@ group("gn_all") {
} }
} }
if (is_mac || is_linux || is_android) { if (is_mac || is_linux || is_android || is_fuchsia) {
deps += [ "//third_party/perfetto:all" ] deps += [ "//third_party/perfetto:all" ]
} }
......
...@@ -28,7 +28,7 @@ source_set("lib") { ...@@ -28,7 +28,7 @@ source_set("lib") {
"//services/tracing/public/cpp", "//services/tracing/public/cpp",
] ]
if (is_mac || is_linux || is_android || is_win) { if (is_mac || is_linux || is_android || is_win || is_fuchsia) {
sources += [ sources += [
"perfetto/json_trace_exporter.cc", "perfetto/json_trace_exporter.cc",
"perfetto/json_trace_exporter.h", "perfetto/json_trace_exporter.h",
...@@ -69,7 +69,7 @@ source_set("tests") { ...@@ -69,7 +69,7 @@ source_set("tests") {
"test_util.h", "test_util.h",
] ]
if (is_mac || is_linux || is_android) { if (is_mac || is_linux || is_android || is_fuchsia) {
sources += [ sources += [
"public/cpp/perfetto/trace_event_data_source_unittest.cc", "public/cpp/perfetto/trace_event_data_source_unittest.cc",
"public/cpp/perfetto/traced_value_proto_writer_unittest.cc", "public/cpp/perfetto/traced_value_proto_writer_unittest.cc",
...@@ -93,7 +93,7 @@ source_set("tests") { ...@@ -93,7 +93,7 @@ source_set("tests") {
"//testing/gtest", "//testing/gtest",
] ]
if (is_mac || is_linux || is_android) { if (is_mac || is_linux || is_android || is_fuchsia) {
sources += [ sources += [
"perfetto/json_trace_exporter_unittest.cc", "perfetto/json_trace_exporter_unittest.cc",
"perfetto/perfetto_integration_unittest.cc", "perfetto/perfetto_integration_unittest.cc",
......
...@@ -24,7 +24,7 @@ component("cpp") { ...@@ -24,7 +24,7 @@ component("cpp") {
"//services/tracing/public/mojom", "//services/tracing/public/mojom",
] ]
if (is_mac || is_linux || is_android || is_win) { if (is_mac || is_linux || is_android || is_win || is_fuchsia) {
sources += [ sources += [
"perfetto/heap_scattered_stream_delegate.cc", "perfetto/heap_scattered_stream_delegate.cc",
"perfetto/heap_scattered_stream_delegate.h", "perfetto/heap_scattered_stream_delegate.h",
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include "services/tracing/public/cpp/tracing_features.h" #include "services/tracing/public/cpp/tracing_features.h"
#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX) || \ #if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX) || \
defined(OS_WIN) defined(OS_WIN) || defined(OS_FUCHSIA)
#define PERFETTO_AVAILABLE #define PERFETTO_AVAILABLE
#include "services/tracing/public/cpp/perfetto/producer_client.h" #include "services/tracing/public/cpp/perfetto/producer_client.h"
#include "services/tracing/public/cpp/perfetto/trace_event_data_source.h" #include "services/tracing/public/cpp/perfetto/trace_event_data_source.h"
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include "services/tracing/coordinator.h" #include "services/tracing/coordinator.h"
#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX) || \ #if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX) || \
defined(OS_WIN) defined(OS_WIN) || defined(OS_FUCHSIA)
#define PERFETTO_SERVICE_AVAILABLE #define PERFETTO_SERVICE_AVAILABLE
#endif #endif
......
...@@ -3993,6 +3993,12 @@ ...@@ -3993,6 +3993,12 @@
}, },
"test": "mojo_unittests" "test": "mojo_unittests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "perfetto_unittests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
...@@ -4175,6 +4181,17 @@ ...@@ -4175,6 +4181,17 @@
}, },
"test": "mojo_unittests" "test": "mojo_unittests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"kvm": "1"
}
]
},
"test": "perfetto_unittests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true, "can_use_on_swarming_builders": true,
...@@ -4406,6 +4423,17 @@ ...@@ -4406,6 +4423,17 @@
}, },
"test": "net_unittests" "test": "net_unittests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"kvm": "1"
}
]
},
"test": "perfetto_unittests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true, "can_use_on_swarming_builders": true,
......
...@@ -806,6 +806,20 @@ ...@@ -806,6 +806,20 @@
}, },
"test": "mojo_unittests" "test": "mojo_unittests"
}, },
{
"args": [
"--qemu-require-kvm"
],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"kvm": "1"
}
]
},
"test": "perfetto_unittests"
},
{ {
"args": [ "args": [
"--qemu-require-kvm" "--qemu-require-kvm"
......
...@@ -2000,6 +2000,10 @@ ...@@ -2000,6 +2000,10 @@
"label": "//third_party/pdfium/samples:pdfium_test", "label": "//third_party/pdfium/samples:pdfium_test",
"type": "additional_compile_target", "type": "additional_compile_target",
}, },
"perfetto_unittests": {
"label": "//third_party/perfetto:perfetto_unittests",
"type": "console_test_launcher",
},
"performance_browser_tests": { "performance_browser_tests": {
"args": [ "args": [
"performance_browser_tests", "performance_browser_tests",
......
...@@ -2742,6 +2742,7 @@ ...@@ -2742,6 +2742,7 @@
'--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.net_unittests.filter', '--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.net_unittests.filter',
], ],
}, },
'perfetto_unittests': {},
'service_manager_unittests': {}, 'service_manager_unittests': {},
'skia_unittests': {}, 'skia_unittests': {},
'sql_unittests': {}, 'sql_unittests': {},
......
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