Commit 186858f9 authored by Chong Gu's avatar Chong Gu Committed by Commit Bot

[Fuchsia] Turn on capture unittests for Fuchsia FYI bot.

Disable VideoCaptureDeviceTest on Fuchsia.
Start running capture unittests on Fuchsia FYI bots, adds 2 minutes of bot time and run time.

Bug: 1075762
Change-Id: I5e62bad602939c438a7f47e8c898304e63a5135e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2168522
Commit-Queue: Chong Gu <chonggu@google.com>
Reviewed-by: default avatarGuido Urdaneta <guidou@chromium.org>
Reviewed-by: default avatarBrian Sheedy <bsheedy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#763499}
parent 8bdf6f98
......@@ -28,6 +28,9 @@
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
// VideoCaptureDevice not implemented on Fuchsia.
#if !defined(OS_FUCHSIA)
#if defined(OS_WIN)
#include <mfcaptureengine.h>
#include "base/win/scoped_com_initializer.h"
......@@ -881,3 +884,4 @@ WRAPPED_TEST_P(VideoCaptureDeviceTest,
#endif
} // namespace media
#endif // !defined(OS_FUCHSIA)
......@@ -187750,6 +187750,25 @@
"test": "boringssl_ssl_tests",
"test_id_prefix": "ninja://third_party/boringssl:boringssl_ssl_tests/"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "arm64",
"inside_docker": "1",
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "capture_unittests",
"test_id_prefix": "ninja://media/capture:capture_unittests/"
},
{
"merge": {
"args": [],
......@@ -188526,6 +188545,24 @@
"test": "boringssl_ssl_tests",
"test_id_prefix": "ninja://third_party/boringssl:boringssl_ssl_tests/"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"kvm": "1",
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "capture_unittests",
"test_id_prefix": "ninja://media/capture:capture_unittests/"
},
{
"merge": {
"args": [],
......@@ -189293,6 +189330,24 @@
"test": "boringssl_ssl_tests",
"test_id_prefix": "ninja://third_party/boringssl:boringssl_ssl_tests/"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"kvm": "1",
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "capture_unittests",
"test_id_prefix": "ninja://media/capture:capture_unittests/"
},
{
"merge": {
"args": [],
......@@ -12350,6 +12350,25 @@
"test": "boringssl_ssl_tests",
"test_id_prefix": "ninja://third_party/boringssl:boringssl_ssl_tests/"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "arm64",
"inside_docker": "1",
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "capture_unittests",
"test_id_prefix": "ninja://media/capture:capture_unittests/"
},
{
"merge": {
"args": [],
......@@ -13126,6 +13145,24 @@
"test": "boringssl_ssl_tests",
"test_id_prefix": "ninja://third_party/boringssl:boringssl_ssl_tests/"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"kvm": "1",
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "capture_unittests",
"test_id_prefix": "ninja://media/capture:capture_unittests/"
},
{
"merge": {
"args": [],
......@@ -13893,6 +13930,24 @@
"test": "boringssl_ssl_tests",
"test_id_prefix": "ninja://third_party/boringssl:boringssl_ssl_tests/"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"kvm": "1",
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "capture_unittests",
"test_id_prefix": "ninja://media/capture:capture_unittests/"
},
{
"merge": {
"args": [],
......@@ -566,6 +566,12 @@
},
},
},
'capture_unittests': {
'remove_from': [
'Fuchsia ARM64', # https://crbug.com/1075762
'Fuchsia x64', # https://crbug.com/1075762
],
},
'cc_unittests': {
'modifications': {
'Linux TSan Tests': {
......
......@@ -1262,6 +1262,7 @@
'blink_platform_unittests': {},
'boringssl_crypto_tests': {},
'boringssl_ssl_tests': {},
'capture_unittests': {},
'cast_runner_browsertests': {},
'cast_runner_integration_tests': {},
'cast_runner_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