Skip to content

GitLab

T
tangled
Commit bf093388 authored by Jeremy Roman's avatar Jeremy Roman Committed by Commit Bot
Browse files
Options

testing: Move gin_unittests to chromium_gtests (re-enable on Android). 

Bug: 843124
Change-Id: I56b9beb4e16e74361cf291998fc78ec232c6fc0c
Reviewed-on: https://chromium-review.googlesource.com/1089587
Commit-Queue: Jeremy Roman <jbroman@chromium.org>
Reviewed-by: default avatarNico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#565367}
parent 751d79d7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 612 additions and 1 deletion
testing/buildbot/chromium.android.fyi.json
View file @ bf093388
...@@ -1835,6 +1835,51 @@ ...@@ -1835,6 +1835,51 @@
}, },
"test": "gfx_unittests" "test": "gfx_unittests"
}, },
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"gin_unittests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
"location": "bin",
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
}
],
"dimension_sets": [
{
"device_os": "NRD91N",
"device_type": "bullhead",
"os": "Android"
}
],
"expiration": 10800,
"hard_timeout": 960,
"output_links": [
{
"link": [
"https://luci-logdog.appspot.com/v/?s",
"=android%2Fswarming%2Flogcats%2F",
"${TASK_ID}%2F%2B%2Funified_logcats"
],
"name": "shard #${SHARD_INDEX} logcats"
}
]
},
"test": "gin_unittests"
},
{ {
"args": [ "args": [
"--gs-results-bucket=chromium-result-details", "--gs-results-bucket=chromium-result-details",
...@@ -3468,6 +3513,12 @@ ...@@ -3468,6 +3513,12 @@
}, },
"test": "gfx_unittests" "test": "gfx_unittests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": false
},
"test": "gin_unittests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": false "can_use_on_swarming_builders": false
...@@ -3818,6 +3869,12 @@ ...@@ -3818,6 +3869,12 @@
}, },
"test": "gfx_unittests" "test": "gfx_unittests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": false
},
"test": "gin_unittests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": false "can_use_on_swarming_builders": false
...@@ -4650,6 +4707,31 @@ ...@@ -4650,6 +4707,31 @@
}, },
"test": "gfx_unittests" "test": "gfx_unittests"
}, },
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"gin_unittests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_type": "coho",
"os": "Android"
}
]
},
"test": "gin_unittests"
},
{ {
"args": [ "args": [
"--gs-results-bucket=chromium-result-details", "--gs-results-bucket=chromium-result-details",
...@@ -6085,6 +6167,31 @@ ...@@ -6085,6 +6167,31 @@
}, },
"test": "gfx_unittests" "test": "gfx_unittests"
}, },
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"gin_unittests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_type": "gce_x86",
"os": "Android"
}
]
},
"test": "gin_unittests"
},
{ {
"args": [ "args": [
"--gs-results-bucket=chromium-result-details", "--gs-results-bucket=chromium-result-details",
......
testing/buildbot/chromium.android.json
View file @ bf093388
This diff is collapsed.
testing/buildbot/chromium.clang.json
View file @ bf093388
...@@ -7886,6 +7886,49 @@ ...@@ -7886,6 +7886,49 @@
}, },
"test": "gfx_unittests" "test": "gfx_unittests"
}, },
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"gin_unittests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
"location": "bin",
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
}
],
"dimension_sets": [
{
"device_os": "KTU84P",
"device_type": "hammerhead",
"os": "Android"
}
],
"output_links": [
{
"link": [
"https://luci-logdog.appspot.com/v/?s",
"=android%2Fswarming%2Flogcats%2F",
"${TASK_ID}%2F%2B%2Funified_logcats"
],
"name": "shard #${SHARD_INDEX} logcats"
}
]
},
"test": "gin_unittests"
},
{ {
"args": [ "args": [
"--gs-results-bucket=chromium-result-details", "--gs-results-bucket=chromium-result-details",
...@@ -10335,6 +10378,49 @@ ...@@ -10335,6 +10378,49 @@
}, },
"test": "gfx_unittests" "test": "gfx_unittests"
}, },
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"gin_unittests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
"location": "bin",
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
}
],
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_type": "bullhead",
"os": "Android"
}
],
"output_links": [
{
"link": [
"https://luci-logdog.appspot.com/v/?s",
"=android%2Fswarming%2Flogcats%2F",
"${TASK_ID}%2F%2B%2Funified_logcats"
],
"name": "shard #${SHARD_INDEX} logcats"
}
]
},
"test": "gin_unittests"
},
{ {
"args": [ "args": [
"--gs-results-bucket=chromium-result-details", "--gs-results-bucket=chromium-result-details",
......
testing/buildbot/chromium.fyi.json
View file @ bf093388
...@@ -5155,6 +5155,18 @@ ...@@ -5155,6 +5155,18 @@
}, },
"test": "gfx_unittests" "test": "gfx_unittests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_type": "coho",
"os": "Android"
}
]
},
"test": "gin_unittests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true, "can_use_on_swarming_builders": true,
...@@ -8326,6 +8338,12 @@ ...@@ -8326,6 +8338,12 @@
}, },
"test": "gcm_unit_tests" "test": "gcm_unit_tests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "gin_unittests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
...@@ -8562,6 +8580,12 @@ ...@@ -8562,6 +8580,12 @@
}, },
"test": "gcm_unit_tests" "test": "gcm_unit_tests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "gin_unittests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
......
testing/buildbot/chromium.memory.json
View file @ bf093388
...@@ -1086,6 +1086,49 @@ ...@@ -1086,6 +1086,49 @@
}, },
"test": "gfx_unittests" "test": "gfx_unittests"
}, },
{
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices"
],
"merge": {
"args": [
"--bucket",
"chromium-result-details",
"--test-name",
"gin_unittests"
],
"script": "//build/android/pylib/results/presentation/test_results_presentation.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"cipd_packages": [
{
"cipd_package": "infra/tools/luci/logdog/butler/${platform}",
"location": "bin",
"revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
}
],
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_type": "bullhead",
"os": "Android"
}
],
"output_links": [
{
"link": [
"https://luci-logdog.appspot.com/v/?s",
"=android%2Fswarming%2Flogcats%2F",
"${TASK_ID}%2F%2B%2Funified_logcats"
],
"name": "shard #${SHARD_INDEX} logcats"
}
]
},
"test": "gin_unittests"
},
{ {
"args": [ "args": [
"--gs-results-bucket=chromium-result-details", "--gs-results-bucket=chromium-result-details",
......
testing/buildbot/test_suites.pyl
View file @ bf093388
...@@ -487,6 +487,7 @@ ...@@ -487,6 +487,7 @@
}, },
'crypto_unittests': {}, 'crypto_unittests': {},
'gcm_unit_tests': {}, 'gcm_unit_tests': {},
'gin_unittests': {},
'google_apis_unittests': {}, 'google_apis_unittests': {},
'gpu_unittests': { 'gpu_unittests': {
'android_swarming': { 'android_swarming': {
...@@ -1903,7 +1904,6 @@ ...@@ -1903,7 +1904,6 @@
'chromedriver_unittests': {}, 'chromedriver_unittests': {},
'extensions_browsertests': {}, 'extensions_browsertests': {},
'extensions_unittests': {}, 'extensions_unittests': {},
'gin_unittests': {}, # crbug.com/843124
'interactive_ui_tests': { 'interactive_ui_tests': {
'swarming': { 'swarming': {
'shards': 2, 'shards': 2,
......
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