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

Unified Diff: scripts/slave/recipes/chromium_mojo.py

Issue 1737843003: Use regular chromium recipes for Chromium Mojo. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Remove 'ninja_confirm_noop' config option. Created 4 years, 10 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
Index: scripts/slave/recipes/chromium_mojo.py
diff --git a/scripts/slave/recipes/chromium_mojo.py b/scripts/slave/recipes/chromium_mojo.py
deleted file mode 100644
index 065f48aa3bba7d75cc94e5f159aaff0822b28520..0000000000000000000000000000000000000000
--- a/scripts/slave/recipes/chromium_mojo.py
+++ /dev/null
@@ -1,86 +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.
-
-import re
-
-from recipe_engine.types import freeze
-from recipe_engine import recipe_api
-
-DEPS = [
- 'depot_tools/bot_update',
- 'chromium',
- 'chromium_android',
- 'recipe_engine/path',
- 'recipe_engine/properties',
- 'recipe_engine/python',
- 'recipe_engine/step',
-]
-
-BUILDERS = freeze({
- 'chromium.mojo': {
- 'builders': {
- 'Chromium Mojo Linux': {
- 'chromium_config_kwargs': {
- 'BUILD_CONFIG': 'Release',
- 'TARGET_PLATFORM': 'linux',
- },
- },
- 'Chromium Mojo Android': {
- 'chromium_config': 'android',
- 'chromium_config_kwargs': {
- 'BUILD_CONFIG': 'Release',
- 'TARGET_PLATFORM': 'android',
- 'TARGET_ARCH': 'arm',
- 'TARGET_BITS': 32,
- },
- 'gclient_apply_config': ['android'],
- },
- 'Chromium Mojo Windows': {
- 'chromium_config_kwargs': {
- 'BUILD_CONFIG': 'Release',
- 'TARGET_PLATFORM': 'win',
- },
- },
- },
- },
-})
-
-
-@recipe_api.composite_step
-def _RunApptests(api):
- # TODO(msw): Run and get compile targets via testing/scripts/mojo_apptests.py.
- runner = api.path['checkout'].join('mojo', 'tools', 'apptest_runner.py')
- api.python('app_tests', runner, [api.chromium.output_dir, '--verbose'])
-
-
-@recipe_api.composite_step
-def _RunUnittests(api):
- if api.chromium.c.TARGET_PLATFORM != 'android':
- api.chromium.runtest('views_mus_unittests', xvfb=True)
-
-
-def RunSteps(api):
- api.chromium.configure_bot(BUILDERS, ['gn'])
-
- api.bot_update.ensure_checkout(force=True)
-
- api.chromium.runhooks()
-
- api.chromium.run_mb(api.properties.get('mastername'),
- api.properties.get('buildername'),
- use_goma=True)
-
- api.chromium.compile(targets=['mojo_apptests'])
-
- if api.chromium.c.TARGET_PLATFORM == 'android':
- api.chromium_android.detect_and_setup_devices()
-
- with api.step.defer_results():
- _RunUnittests(api)
- _RunApptests(api)
-
-
-def GenTests(api):
- for test in api.chromium.gen_tests_for_builders(BUILDERS):
- yield test

Powered by Google App Engine
This is Rietveld 408576698