| Index: scripts/slave/recipe_modules/chromium_tests/chromium_fyi.py
|
| diff --git a/scripts/slave/recipe_modules/chromium_tests/chromium_fyi.py b/scripts/slave/recipe_modules/chromium_tests/chromium_fyi.py
|
| index 6e639793612306118002510b8fce798fd294abf6..08f34ad66be231c511085dbfc7b8c51e327d72b8 100644
|
| --- a/scripts/slave/recipe_modules/chromium_tests/chromium_fyi.py
|
| +++ b/scripts/slave/recipe_modules/chromium_tests/chromium_fyi.py
|
| @@ -1976,114 +1976,6 @@ SPEC = {
|
| },
|
| },
|
|
|
| - 'Android Tests (amp split)': {
|
| - 'chromium_config': 'android',
|
| - 'gclient_config': 'chromium',
|
| - 'gclient_apply_config': ['android'],
|
| - 'amp_config': 'commit_queue_pool',
|
| - 'chromium_config_kwargs': {
|
| - 'BUILD_CONFIG': 'Release',
|
| - 'TARGET_BITS': 32,
|
| - 'TARGET_PLATFORM': 'android',
|
| - },
|
| - 'bot_type': 'tester',
|
| - 'parent_buildername': 'Android Builder (dbg)',
|
| - 'android_config': 'main_builder',
|
| - 'root_devices': True,
|
| - 'enable_swarming': False,
|
| - 'tests': [
|
| - steps.AndroidInstrumentationTest('AndroidWebViewTest'),
|
| - steps.AndroidInstrumentationTest('ContentShellTest'),
|
| - steps.AndroidInstrumentationTest('ChromePublicTest'),
|
| - steps.AndroidInstrumentationTest('ChromeSyncShellTest'),
|
| - steps.AMPGTestTest('android_webview_unittests',
|
| - device_name=['Nexus 5'], device_os=['4.4.2']),
|
| - steps.AMPGTestTest('base_unittests',
|
| - device_name=['Nexus 5'], device_os=['4.4.2'],
|
| - android_isolate_path='base/base_unittests.isolate'),
|
| - steps.GTestTest(
|
| - 'breakpad_unittests',
|
| - override_compile_targets=['breakpad_unittests_deps']),
|
| - steps.GTestTest('cc_unittests'),
|
| - steps.AMPGTestTest('components_unittests',
|
| - device_name=['Nexus 5'], device_os=['4.4.2'],
|
| - android_isolate_path='components/components_unittests.isolate'),
|
| - steps.GTestTest('content_browsertests'),
|
| - steps.GTestTest('content_unittests'),
|
| - steps.AMPGTestTest('events_unittests',
|
| - device_name=['Nexus 5'], device_os=['4.4.2']),
|
| - steps.AMPGTestTest('gl_tests',
|
| - device_name=['Nexus 5'], device_os=['4.4.2']),
|
| - steps.GTestTest('gpu_unittests'),
|
| - steps.AMPGTestTest('ipc_tests', device_name=['Nexus 5'],
|
| - device_os=['4.4.2']),
|
| - steps.GTestTest('media_unittests'),
|
| - steps.GTestTest('net_unittests',
|
| - android_isolate_path='net/net_unittests.isolate',
|
| - android_shard_timeout=300),
|
| - steps.GTestTest(
|
| - 'sandbox_linux_unittests',
|
| - override_compile_targets=['sandbox_linux_unittests_deps']),
|
| - steps.AMPGTestTest('sql_unittests',
|
| - device_name=['Nexus 5'], device_os=['4.4.2'],
|
| - android_isolate_path='sql/sql_unittests.isolate'),
|
| - steps.AMPGTestTest('sync_unit_tests',
|
| - device_name=['Nexus 5'], device_os=['4.4.2'],
|
| - android_isolate_path='sync/sync_unit_tests.isolate'),
|
| - steps.AMPGTestTest('ui_android_unittests',
|
| - device_name=['Nexus 5'], device_os=['4.4.2']),
|
| - steps.GTestTest('ui_base_unittests'),
|
| - steps.AMPGTestTest('ui_touch_selection_unittests',
|
| - device_name=['Nexus 5'], device_os=['4.4.2']),
|
| - steps.GTestTest('unit_tests'),
|
| - steps.AndroidJunitTest('junit_unit_tests'),
|
| - steps.AndroidJunitTest('chrome_junit_tests'),
|
| - steps.AndroidJunitTest('content_junit_tests'),
|
| - ],
|
| - 'test_generators': [
|
| - steps.generate_gtest,
|
| - steps.generate_script,
|
| - steps.generate_isolated_script,
|
| - ],
|
| - 'testing': {
|
| - 'platform': 'linux',
|
| - },
|
| - },
|
| -
|
| - 'Android Tests (amp instrumentation test split)': {
|
| - 'chromium_config': 'android',
|
| - 'gclient_config': 'chromium',
|
| - 'gclient_apply_config': ['android'],
|
| - 'amp_config': 'main_pool',
|
| - 'chromium_config_kwargs': {
|
| - 'BUILD_CONFIG': 'Release',
|
| - 'TARGET_BITS': 32,
|
| - 'TARGET_PLATFORM': 'android',
|
| - },
|
| - 'bot_type': 'tester',
|
| - 'parent_buildername': 'Android Builder (dbg)',
|
| - 'android_config': 'main_builder',
|
| - 'root_devices': True,
|
| - 'enable_swarming': False,
|
| - 'tests': [
|
| - steps.AMPInstrumentationTest(
|
| - test_apk='AndroidWebViewTest',
|
| - apk_under_test='AndroidWebView',
|
| - android_isolate_path=
|
| - 'android_webview/android_webview_test_data.isolate',
|
| - compile_target='android_webview_test_apk',
|
| - device_name=['Nexus 5'], device_os=['4.4.2']),
|
| - ],
|
| - 'test_generators': [
|
| - steps.generate_gtest,
|
| - steps.generate_script,
|
| - steps.generate_isolated_script,
|
| - ],
|
| - 'testing': {
|
| - 'platform': 'linux',
|
| - },
|
| - },
|
| -
|
| 'Android Remoting Tests': {
|
| 'chromium_config': 'android',
|
| 'gclient_config': 'chromium',
|
|
|