Commit b3cca6f0 authored by Kenneth Russell's avatar Kenneth Russell Committed by Commit Bot

Remove nonexistent Android bots from chromium.linux waterfall.

These machines were moved to the chromium.android waterfall a while
back but their JSON entries were forgotten. Remove the definitions of
these bots and the test suite exceptions referring to them. (The
presubmit checks caught all of the stray exceptions.)

Add cast_junit_test_lists to Cast Android (dbg) on chromium.android,
which is presuambly where it should have been placed during this
migration.

BUG=662541

Change-Id: Iaa0453b17e06e31096ecf4e770557ad6aa7d7fd6
Reviewed-on: https://chromium-review.googlesource.com/809633Reviewed-by: default avatarJohn Budorick <jbudorick@chromium.org>
Reviewed-by: default avatarDirk Pranke <dpranke@chromium.org>
Commit-Queue: Kenneth Russell <kbr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#521847}
parent 1ffc80d6
...@@ -673,6 +673,7 @@ ...@@ -673,6 +673,7 @@
}, },
"Cast Android (dbg)": { "Cast Android (dbg)": {
"additional_compile_targets": [ "additional_compile_targets": [
"cast_junit_test_lists",
"cast_shell_apk" "cast_shell_apk"
] ]
}, },
......
This diff is collapsed.
This diff is collapsed.
...@@ -50,6 +50,7 @@ ...@@ -50,6 +50,7 @@
}, },
'Cast Android (dbg)': { 'Cast Android (dbg)': {
'additional_compile_targets': [ 'additional_compile_targets': [
'cast_junit_test_lists',
'cast_shell_apk', 'cast_shell_apk',
], ],
}, },
...@@ -290,29 +291,6 @@ ...@@ -290,29 +291,6 @@
{ {
'name': 'chromium.linux', 'name': 'chromium.linux',
'machines': { 'machines': {
'Android Arm64 Builder (dbg)': {
'additional_compile_targets': [
'all',
],
},
'Android Builder': {
'additional_compile_targets': [
'cronet_test_instrumentation_apk',
'monochrome_static_initializers',
],
},
'Android Clang Builder (dbg)': {
'additional_compile_targets': [
'all',
],
},
'Cast Android (dbg)': {
'additional_compile_targets': [
'cast_junit_test_lists',
'cast_shell_apk',
'cast_test_lists',
],
},
'Fuchsia ARM64': { 'Fuchsia ARM64': {
'additional_compile_targets': [ 'additional_compile_targets': [
'base_unittests', 'base_unittests',
...@@ -365,36 +343,6 @@ ...@@ -365,36 +343,6 @@
'sync_integration_tests' 'sync_integration_tests'
] ]
}, },
'Android Tests': {
'test_suites': {
'gtest_tests': 'chromium_android_gtests',
'junit_tests': 'chromium_junit_tests',
},
'swarming': {
'dimension_sets': [
{
'device_os': 'KTU84P',
'device_type': 'hammerhead',
},
],
},
'os_type': 'android',
},
'Android Tests (dbg)': {
'test_suites': {
'gtest_tests': 'chromium_android_gtests',
'junit_tests': 'chromium_junit_tests',
},
'swarming': {
'dimension_sets': [
{
'device_os': 'KTU84P',
'device_type': 'hammerhead',
},
],
},
'os_type': 'android',
},
'Cast Audio Linux': { 'Cast Audio Linux': {
'additional_compile_targets': [ 'additional_compile_targets': [
'cast_shell', 'cast_shell',
......
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