Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(575)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipe_modules/chromium/chromium_linux.py

Issue 1185693002: Move builders.py and steps.py to chromium_tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Address review comments. Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « scripts/slave/recipe_modules/chromium/chromium_fyi.py ('k') | scripts/slave/recipe_modules/chromium/chromium_lkgr.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipe_modules/chromium/chromium_linux.py
diff --git a/scripts/slave/recipe_modules/chromium/chromium_linux.py b/scripts/slave/recipe_modules/chromium/chromium_linux.py
deleted file mode 100644
index d6f962a32f341a4f98040b687bcdb7ebe3dbe685..0000000000000000000000000000000000000000
--- a/scripts/slave/recipe_modules/chromium/chromium_linux.py
+++ /dev/null
@@ -1,449 +0,0 @@
-# Copyright 2014 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-from . import steps
-
-SPEC = {
- 'settings': {
- 'build_gs_bucket': 'chromium-linux-archive',
- },
- 'builders': {
- 'Linux ARM': {
- 'chromium_config': 'chromium',
- 'gclient_config': 'chromium',
- 'chromium_config_kwargs': {
- 'BUILD_CONFIG': 'Release',
- 'TARGET_ARCH': 'arm',
- 'TARGET_BITS': 32,
- },
- 'bot_type': 'builder',
- 'compile_targets': [
- 'all',
- ],
- 'use_isolate': True,
- 'testing': {
- 'platform': 'linux',
- },
- },
- 'Linux Builder': {
- 'chromium_config': 'chromium',
- 'gclient_config': 'chromium',
- 'chromium_config_kwargs': {
- 'BUILD_CONFIG': 'Release',
- 'TARGET_BITS': 64,
- },
- 'bot_type': 'builder',
- 'compile_targets': [
- 'chromium_swarm_tests',
- ],
- 'testing': {
- 'platform': 'linux',
- },
- 'use_isolate': True,
- 'enable_swarming': True,
- },
- 'Linux Tests': {
- 'chromium_config': 'chromium',
- 'gclient_config': 'chromium',
- 'chromium_config_kwargs': {
- 'BUILD_CONFIG': 'Release',
- 'TARGET_BITS': 64,
- },
- 'bot_type': 'tester',
- 'test_generators': [
- steps.generate_gtest,
- steps.generate_script,
- ],
- 'parent_buildername': 'Linux Builder',
- 'testing': {
- 'platform': 'linux',
- },
- 'enable_swarming': True,
- },
- 'Linux Builder (dbg)(32)': {
- 'chromium_config': 'chromium',
- 'gclient_config': 'chromium',
- 'chromium_config_kwargs': {
- 'BUILD_CONFIG': 'Debug',
- 'TARGET_BITS': 32,
- },
- 'bot_type': 'builder',
- 'compile_targets': [
- 'google_apis_unittests',
- 'sync_integration_tests',
- ],
- 'testing': {
- 'platform': 'linux',
- },
- 'use_isolate': True,
- 'enable_swarming': True,
- # Temporary hack because the binaries are too large to be isolated.
- 'GYP_DEFINES': {
- 'fastbuild': 2,
- },
- },
- 'Linux Tests (dbg)(1)(32)': {
- 'chromium_config': 'chromium',
- 'gclient_config': 'chromium',
- 'chromium_config_kwargs': {
- 'BUILD_CONFIG': 'Debug',
- 'TARGET_BITS': 32,
- },
- 'bot_type': 'tester',
- 'test_generators': [
- steps.generate_gtest,
- steps.generate_script,
- ],
- 'parent_buildername': 'Linux Builder (dbg)(32)',
- 'testing': {
- 'platform': 'linux',
- },
- 'enable_swarming': True,
- },
-
- 'Linux Builder (dbg)': {
- 'chromium_config': 'chromium',
- 'gclient_config': 'chromium',
- 'chromium_config_kwargs': {
- 'BUILD_CONFIG': 'Debug',
- 'TARGET_BITS': 64,
- },
- 'bot_type': 'builder',
- 'testing': {
- 'platform': 'linux',
- },
- 'enable_swarming': True,
- 'use_isolate': True,
- },
- 'Linux Tests (dbg)(1)': {
- 'chromium_config': 'chromium',
- 'gclient_config': 'chromium',
- 'chromium_config_kwargs': {
- 'BUILD_CONFIG': 'Debug',
- 'TARGET_BITS': 64,
- },
- 'bot_type': 'tester',
- 'test_generators': [
- steps.generate_gtest,
- steps.generate_script,
- ],
- 'parent_buildername': 'Linux Builder (dbg)',
- 'testing': {
- 'platform': 'linux',
- },
- 'enable_swarming': True,
- },
-
- 'Android Arm64 Builder (dbg)': {
- 'chromium_config': 'android',
- 'gclient_config': 'chromium',
- 'gclient_apply_config': ['android'],
- 'chromium_config_kwargs': {
- 'BUILD_CONFIG': 'Debug',
- 'TARGET_BITS': 64,
- 'TARGET_PLATFORM': 'android',
- },
- 'android_config': 'arm64_builder',
- 'testing': {
- 'platform': 'linux',
- },
- },
- 'Android Builder (dbg)': {
- 'chromium_config': 'android',
- 'gclient_config': 'chromium',
- 'gclient_apply_config': ['android'],
- 'chromium_config_kwargs': {
- 'BUILD_CONFIG': 'Debug',
- 'TARGET_BITS': 32,
- 'TARGET_PLATFORM': 'android',
- },
- 'android_config': 'main_builder',
- 'bot_type': 'builder',
- 'testing': {
- 'platform': 'linux',
- },
- },
- 'Android Tests (dbg)': {
- 'chromium_config': 'android',
- 'gclient_config': 'chromium',
- 'gclient_apply_config': ['android'],
- 'chromium_config_kwargs': {
- 'BUILD_CONFIG': 'Debug',
- 'TARGET_BITS': 32,
- 'TARGET_PLATFORM': 'android',
- },
- 'bot_type': 'tester',
- 'parent_buildername': 'Android Builder (dbg)',
- 'android_config': 'main_builder',
- 'root_devices': True,
- 'tests': [
- steps.AndroidInstrumentationTest(
- 'AndroidWebViewTest', 'android_webview_test_apk',
- isolate_file_path='android_webview/android_webview_test_apk.isolate',
- adb_install_apk=(
- 'AndroidWebView.apk', 'org.chromium.android_webview.shell')),
- steps.AndroidInstrumentationTest(
- 'ChromePublicTest', 'chrome_public_test_apk',
- isolate_file_path='chrome/chrome_public_test_apk.isolate',
- adb_install_apk=('ChromePublic.apk', 'org.chromium.chrome')),
- steps.AndroidInstrumentationTest(
- 'ChromeShellTest', 'chrome_shell_test_apk',
- isolate_file_path='chrome/chrome_shell_test_apk.isolate',
- adb_install_apk=(
- 'ChromeShell.apk', 'org.chromium.chrome.shell')),
- steps.AndroidInstrumentationTest(
- 'ContentShellTest', 'content_shell_test_apk',
- isolate_file_path='content/content_shell_test_apk.isolate',
- adb_install_apk=(
- 'ContentShell.apk', 'org.chromium.content_shell_apk')),
- steps.AndroidInstrumentationTest(
- 'ChromeSyncShellTest', 'chrome_sync_shell_test_apk',
- adb_install_apk=(
- 'ChromeSyncShell.apk', 'org.chromium.chrome.browser.sync')),
- steps.GTestTest('android_webview_unittests'),
- steps.GTestTest(
- 'base_unittests',
- android_isolate_path='base/base_unittests.isolate'),
- steps.GTestTest(
- 'breakpad_unittests',
- override_compile_targets=['breakpad_unittests_deps'],
- android_isolate_path='breakpad/breakpad_unittests.isolate'),
- steps.GTestTest('cc_unittests'),
- steps.GTestTest(
- 'components_unittests',
- android_isolate_path='components/components_unittests.isolate'),
- steps.GTestTest(
- 'content_browsertests',
- android_isolate_path='content/content_browsertests.isolate'),
- steps.GTestTest(
- 'content_unittests',
- android_isolate_path='content/content_unittests.isolate'),
- steps.GTestTest('device_unittests'),
- steps.GTestTest('events_unittests'),
- steps.GTestTest('gl_tests'),
- steps.GTestTest('gl_unittests'),
- steps.GTestTest('gpu_unittests'),
- steps.GTestTest('ipc_tests'),
- steps.GTestTest(
- 'media_unittests',
- android_isolate_path='media/media_unittests.isolate'),
- steps.GTestTest(
- 'net_unittests',
- android_isolate_path='net/net_unittests.isolate'),
- steps.GTestTest(
- 'sandbox_linux_unittests',
- override_compile_targets=['sandbox_linux_unittests_deps']),
- steps.GTestTest(
- 'sql_unittests',
- android_isolate_path='sql/sql_unittests.isolate'),
- steps.GTestTest(
- 'sync_unit_tests',
- android_isolate_path='sync/sync_unit_tests.isolate'),
- steps.GTestTest('ui_android_unittests'),
- steps.GTestTest(
- 'ui_base_unittests',
- android_isolate_path='ui/base/ui_base_tests.isolate'),
- steps.GTestTest('ui_touch_selection_unittests'),
- steps.GTestTest(
- 'unit_tests',
- android_isolate_path='chrome/unit_tests.isolate'),
- steps.AndroidJunitTest('base_junit_tests'),
- steps.AndroidJunitTest('chrome_junit_tests'),
- steps.AndroidJunitTest('content_junit_tests'),
- steps.AndroidJunitTest('junit_unit_tests'),
- ],
- 'test_generators': [
- steps.generate_gtest,
- steps.generate_script,
- ],
- 'testing': {
- 'platform': 'linux',
- },
- },
-
- 'Android Builder': {
- 'chromium_config': 'android',
- 'gclient_config': 'chromium',
- 'gclient_apply_config': ['android'],
- 'chromium_config_kwargs': {
- 'BUILD_CONFIG': 'Release',
- 'TARGET_BITS': 32,
- 'TARGET_PLATFORM': 'android',
- },
- 'android_config': 'main_builder',
- 'bot_type': 'builder',
- 'testing': {
- 'platform': 'linux',
- },
- },
- 'Android Tests': {
- 'chromium_config': 'android',
- 'gclient_config': 'chromium',
- 'gclient_apply_config': ['android'],
- 'chromium_config_kwargs': {
- 'BUILD_CONFIG': 'Release',
- 'TARGET_BITS': 32,
- 'TARGET_PLATFORM': 'android',
- },
- 'bot_type': 'tester',
- 'parent_buildername': 'Android Builder',
- 'android_config': 'main_builder',
- 'root_devices': True,
- 'tests': [
- steps.AndroidInstrumentationTest(
- 'AndroidWebViewTest', 'android_webview_test_apk',
- isolate_file_path='android_webview/android_webview_test_apk.isolate',
- adb_install_apk=(
- 'AndroidWebView.apk', 'org.chromium.android_webview.shell')),
- steps.AndroidInstrumentationTest(
- 'ChromePublicTest', 'chrome_public_test_apk',
- isolate_file_path='chrome/chrome_public_test_apk.isolate',
- adb_install_apk=('ChromePublic.apk', 'org.chromium.chrome')),
- steps.AndroidInstrumentationTest(
- 'ChromeShellTest', 'chrome_shell_test_apk',
- isolate_file_path='chrome/chrome_shell_test_apk.isolate',
- adb_install_apk=(
- 'ChromeShell.apk', 'org.chromium.chrome.shell')),
- steps.AndroidInstrumentationTest(
- 'ContentShellTest', 'content_shell_test_apk',
- isolate_file_path='content/content_shell_test_apk.isolate',
- adb_install_apk=(
- 'ContentShell.apk', 'org.chromium.content_shell_apk')),
- steps.AndroidInstrumentationTest(
- 'ChromeSyncShellTest', 'chrome_sync_shell_test_apk',
- adb_install_apk=(
- 'ChromeSyncShell.apk', 'org.chromium.chrome.browser.sync')),
- steps.GTestTest('android_webview_unittests'),
- steps.GTestTest(
- 'base_unittests',
- android_isolate_path='base/base_unittests.isolate'),
- steps.GTestTest(
- 'breakpad_unittests',
- override_compile_targets=['breakpad_unittests_deps'],
- android_isolate_path='breakpad/breakpad_unittests.isolate'),
- steps.GTestTest('cc_unittests'),
- steps.GTestTest(
- 'components_unittests',
- android_isolate_path='components/components_unittests.isolate'),
- steps.GTestTest(
- 'content_browsertests',
- android_isolate_path='content/content_browsertests.isolate'),
- steps.GTestTest(
- 'content_unittests',
- android_isolate_path='content/content_unittests.isolate'),
- steps.GTestTest('device_unittests'),
- steps.GTestTest('events_unittests'),
- steps.GTestTest('gl_tests'),
- steps.GTestTest('gl_unittests'),
- steps.GTestTest('gpu_unittests'),
- steps.GTestTest('ipc_tests'),
- steps.GTestTest(
- 'media_unittests',
- android_isolate_path='media/media_unittests.isolate'),
- steps.GTestTest(
- 'net_unittests',
- android_isolate_path='net/net_unittests.isolate'),
- steps.GTestTest(
- 'sandbox_linux_unittests',
- override_compile_targets=['sandbox_linux_unittests_deps']),
- steps.GTestTest(
- 'sql_unittests',
- android_isolate_path='sql/sql_unittests.isolate'),
- steps.GTestTest(
- 'sync_unit_tests',
- android_isolate_path='sync/sync_unit_tests.isolate'),
- steps.GTestTest('ui_android_unittests'),
- steps.GTestTest(
- 'ui_base_unittests',
- android_isolate_path='ui/base/ui_base_tests.isolate'),
- steps.GTestTest('ui_touch_selection_unittests'),
- steps.GTestTest(
- 'unit_tests',
- android_isolate_path='chrome/unit_tests.isolate'),
- steps.AndroidJunitTest('base_junit_tests'),
- steps.AndroidJunitTest('chrome_junit_tests'),
- steps.AndroidJunitTest('content_junit_tests'),
- steps.AndroidJunitTest('junit_unit_tests'),
- ],
- 'test_generators': [
- steps.generate_gtest,
- steps.generate_script,
- ],
- 'testing': {
- 'platform': 'linux',
- },
- },
-
- 'Android Clang Builder (dbg)': {
- 'chromium_config': 'android_clang',
- 'gclient_config': 'chromium',
- 'gclient_apply_config': ['android'],
- 'chromium_config_kwargs': {
- 'BUILD_CONFIG': 'Debug',
- 'TARGET_BITS': 32,
- 'TARGET_PLATFORM': 'android',
- },
- 'android_config': 'clang_builder',
- 'bot_type': 'builder_tester',
- 'compile_targets': [
- 'all',
- ],
- 'testing': {
- 'platform': 'linux',
- },
- },
-
- 'Android x86 Builder (dbg)': {
- 'chromium_config': 'android',
- 'gclient_config': 'chromium',
- 'gclient_apply_config': ['android'],
- 'chromium_config_kwargs': {
- 'BUILD_CONFIG': 'Debug',
- 'TARGET_BITS': 32,
- 'TARGET_PLATFORM': 'android',
- },
- 'android_config': 'x86_builder',
- 'bot_type': 'builder',
- 'testing': {
- 'platform': 'linux',
- },
- },
-
- 'Cast Linux': {
- 'chromium_config': 'cast_linux',
- 'gclient_config': 'chromium',
- 'chromium_config_kwargs': {
- 'BUILD_CONFIG': 'Release',
- 'TARGET_BITS': 64,
- },
- 'compile_targets': [
- 'cast_shell',
- ],
- 'test_generators': [
- steps.generate_gtest,
- steps.generate_script,
- ],
- 'testing': {
- 'platform': 'linux',
- },
- },
- 'Cast Android (dbg)': {
- 'chromium_config': 'android',
- 'gclient_config': 'chromium',
- 'gclient_apply_config': ['android'],
- 'compile_targets': [
- 'cast_shell_apk',
- ],
- 'chromium_config_kwargs': {
- 'BUILD_CONFIG': 'Debug',
- 'TARGET_BITS': 32,
- 'TARGET_PLATFORM': 'android',
- },
- 'android_config': 'cast_builder',
- 'testing': {
- 'platform': 'linux',
- },
- },
- },
-}
« no previous file with comments | « scripts/slave/recipe_modules/chromium/chromium_fyi.py ('k') | scripts/slave/recipe_modules/chromium/chromium_lkgr.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698