Skip to content

GitLab

T
tangled
Commit 6b67a403 authored by Nico Weber's avatar Nico Weber Committed by Commit Bot
Browse files
Options

Remove viz_gtests, move these tests into non_android_chromium_gtests. 

Simplifies the config, and fixes an oversight were the tests were running
on the regular cros bots, but not on the cros memory bots.

Bug: 843511
Change-Id: I751ead56fca4adec28b991243a03cc516417ca3f
Reviewed-on: https://chromium-review.googlesource.com/1104799
Commit-Queue: Nico Weber <thakis@chromium.org>
Reviewed-by: default avatarJonathan Ross <jonross@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568175}
parent d7fb3a65
Show whitespace changes
Inline Side-by-side
Showing with 146 additions and 36 deletions
testing/buildbot/chromium.chromiumos.json
View file @ 6b67a403
......@@ -309,6 +309,18 @@
},
"test": "browser_tests"
},
{
"args": [
"--enable-features=VizDisplayCompositor",
"--test-launcher-filter-file=../../testing/buildbot/filters/viz.browser_tests.filter"
],
"name": "viz_browser_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"shards": 20
},
"test": "browser_tests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -359,6 +371,29 @@
"test": "content_browsertests"
},
{
"args": [
"--enable-features=VizDisplayCompositor",
"--test-launcher-filter-file=../../testing/buildbot/filters/viz.content_browsertests.filter"
],
"name": "viz_content_browsertests",
"swarming": {
"can_use_on_swarming_builders": true,
"shards": 2
},
"test": "content_browsertests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "content_unittests"
},
{
"args": [
"--enable-features=VizDisplayCompositor",
"--test-launcher-filter-file=../../testing/buildbot/filters/viz.content_unittests.filter"
],
"name": "viz_content_unittests",
"swarming": {
"can_use_on_swarming_builders": true
},
......
testing/buildbot/chromium.memory.json
View file @ 6b67a403
......@@ -4144,6 +4144,19 @@
},
"test": "browser_tests"
},
{
"args": [
"--enable-features=VizDisplayCompositor",
"--test-launcher-filter-file=../../testing/buildbot/filters/viz.browser_tests.filter",
"--test-launcher-filter-file=../../testing/buildbot/filters/browser_tests_cros_asan.filter"
],
"name": "viz_browser_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"shards": 10
},
"test": "browser_tests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -4218,6 +4231,29 @@
"test": "content_browsertests"
},
{
"args": [
"--enable-features=VizDisplayCompositor",
"--test-launcher-filter-file=../../testing/buildbot/filters/viz.content_browsertests.filter"
],
"name": "viz_content_browsertests",
"swarming": {
"can_use_on_swarming_builders": true,
"shards": 4
},
"test": "content_browsertests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "content_unittests"
},
{
"args": [
"--enable-features=VizDisplayCompositor",
"--test-launcher-filter-file=../../testing/buildbot/filters/viz.content_unittests.filter"
],
"name": "viz_content_unittests",
"swarming": {
"can_use_on_swarming_builders": true
},
......@@ -4641,6 +4677,18 @@
},
"test": "browser_tests"
},
{
"args": [
"--enable-features=VizDisplayCompositor",
"--test-launcher-filter-file=../../testing/buildbot/filters/viz.browser_tests.filter"
],
"name": "viz_browser_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"shards": 10
},
"test": "browser_tests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -4714,6 +4762,29 @@
"test": "content_browsertests"
},
{
"args": [
"--enable-features=VizDisplayCompositor",
"--test-launcher-filter-file=../../testing/buildbot/filters/viz.content_browsertests.filter"
],
"name": "viz_content_browsertests",
"swarming": {
"can_use_on_swarming_builders": true,
"shards": 2
},
"test": "content_browsertests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "content_unittests"
},
{
"args": [
"--enable-features=VizDisplayCompositor",
"--test-launcher-filter-file=../../testing/buildbot/filters/viz.content_unittests.filter"
],
"name": "viz_content_unittests",
"swarming": {
"can_use_on_swarming_builders": true
},
......
testing/buildbot/test_suite_exceptions.pyl
View file @ 6b67a403
......@@ -2437,6 +2437,12 @@
'Win10 Tests x64 (dbg)',
],
'modifications': {
# chromium.chromiumos
'linux-chromeos-dbg': {
'swarming': {
'shards': 20,
},
},
# chromium.clang
'ToTWin(dbg)': {
'swarming': {
......@@ -2456,6 +2462,11 @@
'shards': 20,
},
},
'Linux Chromium OS ASan LSan Tests (1)': {
'args': [
'--test-launcher-filter-file=../../testing/buildbot/filters/browser_tests_cros_asan.filter',
],
},
},
},
'viz_screenshot_sync_tests': {
......
testing/buildbot/test_suites.pyl
View file @ 6b67a403
......@@ -1924,6 +1924,35 @@
'snapshot_unittests': {},
'sync_integration_tests': {},
'views_unittests': {},
# TODO(thakis): When they work on Android, move viz_ tests to
# chromium_gtests_for_devices_with_graphical_output.
'viz_browser_tests': {
'args': [
'--enable-features=VizDisplayCompositor',
'--test-launcher-filter-file=../../testing/buildbot/filters/viz.browser_tests.filter'
],
'swarming': {
'shards': 10,
},
'test': 'browser_tests',
},
'viz_content_browsertests': {
'args': [
'--enable-features=VizDisplayCompositor',
'--test-launcher-filter-file=../../testing/buildbot/filters/viz.content_browsertests.filter'
],
'swarming': {
'shards': 2,
},
'test': 'content_browsertests',
},
'viz_content_unittests': {
'args': [
'--enable-features=VizDisplayCompositor',
'--test-launcher-filter-file=../../testing/buildbot/filters/viz.content_unittests.filter',
],
'test': 'content_unittests',
}
},
'non_android_and_cast_and_chromeos_chromium_gtests': {
......@@ -2264,36 +2293,6 @@
},
},
'viz_gtests': {
'viz_browser_tests': {
'args': [
'--enable-features=VizDisplayCompositor',
'--test-launcher-filter-file=../../testing/buildbot/filters/viz.browser_tests.filter'
],
'swarming': {
'shards': 10,
},
'test': 'browser_tests',
},
'viz_content_browsertests': {
'args': [
'--enable-features=VizDisplayCompositor',
'--test-launcher-filter-file=../../testing/buildbot/filters/viz.content_browsertests.filter'
],
'swarming': {
'shards': 2,
},
'test': 'content_browsertests',
},
'viz_content_unittests': {
'args': [
'--enable-features=VizDisplayCompositor',
'--test-launcher-filter-file=../../testing/buildbot/filters/viz.content_unittests.filter',
],
'test': 'content_unittests',
}
},
'vr_platform_specific_chromium_gtests': {
# Only run on platforms that intend to support WebVR in the near
# future.
......@@ -2446,7 +2445,6 @@
'non_mac_chromium_gtests',
'site_isolation_chromium_gtests',
'site_isolation_chromium_linux_gtests',
'viz_gtests',
'vr_platform_specific_chromium_gtests',
'gl_gtests',
],
......@@ -2464,7 +2462,6 @@
'non_mac_chromium_gtests',
'site_isolation_chromium_gtests',
'site_isolation_chromium_linux_gtests',
'viz_gtests',
'vr_platform_specific_chromium_gtests',
],
......@@ -2499,7 +2496,6 @@
'mash_chromium_gtests',
'non_android_chromium_gtests',
'non_mac_chromium_gtests',
'viz_gtests',
],
'chromium_linux_dbg_isolated_scripts': [
......@@ -2532,7 +2528,6 @@
'non_android_chromium_gtests',
'non_android_and_cast_and_chromeos_chromium_gtests',
'non_linux_chromium_gtests',
'viz_gtests',
],
'chromium_memory_chromiumos_asan_gtests': [
......@@ -2558,7 +2553,6 @@
'non_android_chromium_gtests',
'non_android_and_cast_and_chromeos_chromium_gtests',
'non_mac_chromium_gtests',
'viz_gtests',
'vr_platform_specific_chromium_gtests',
],
......@@ -2571,7 +2565,6 @@
'non_android_and_cast_and_chromeos_chromium_gtests',
'non_linux_chromium_gtests',
'non_mac_chromium_gtests',
'viz_gtests',
'vr_platform_specific_chromium_gtests',
'win_specific_chromium_gtests',
],
......
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