Commit 28dfb549 authored by Garrett Beaty's avatar Garrett Beaty Committed by Commit Bot

Minor fix-ups to builders.star.

Fix misspelling of coverage in docstring.

Add section comments that I intended to add in
https://crrev.com/c/1837196, but must have changed it on the wrong local
branch.

Bug: 1011908
Change-Id: I2cd0bea4d157dcd4e4c5b9a34f9d5dd0b64e4967
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1865534
Auto-Submit: Garrett Beaty <gbeaty@chromium.org>
Reviewed-by: default avatarStephen Martinis <martiniss@chromium.org>
Commit-Queue: Stephen Martinis <martiniss@chromium.org>
Cr-Commit-Position: refs/heads/master@{#706571}
parent 17b154f7
...@@ -20,6 +20,10 @@ for use with the corresponding arguments to `builder`. ...@@ -20,6 +20,10 @@ for use with the corresponding arguments to `builder`.
""" """
################################################################################
# Constants for use with the builder function #
################################################################################
# The cpu constants to be used with the builder function # The cpu constants to be used with the builder function
cpu = struct( cpu = struct(
X86 = 'x86', X86 = 'x86',
...@@ -95,6 +99,10 @@ goma = struct( ...@@ -95,6 +99,10 @@ goma = struct(
) )
################################################################################
# Implementation details #
################################################################################
_DEFAULT_BUILDERLESS_OSES = [os.LINUX_TRUSTY, os.LINUX_XENIAL] _DEFAULT_BUILDERLESS_OSES = [os.LINUX_TRUSTY, os.LINUX_XENIAL]
...@@ -145,6 +153,10 @@ def _code_coverage_property(*, use_clang_coverage, use_java_coverage): ...@@ -145,6 +153,10 @@ def _code_coverage_property(*, use_clang_coverage, use_java_coverage):
return code_coverage or None return code_coverage or None
################################################################################
# Builder defaults and function #
################################################################################
# The module-level defaults to use with the builder function # The module-level defaults to use with the builder function
defaults = struct( defaults = struct(
# Our custom arguments # Our custom arguments
...@@ -256,10 +268,10 @@ def builder( ...@@ -256,10 +268,10 @@ def builder(
to be used by the builder. Sets the 'jobs' field of the '$build/goma' to be used by the builder. Sets the 'jobs' field of the '$build/goma'
property will be set according to the enum member. By default, the 'jobs' property will be set according to the enum member. By default, the 'jobs'
considered None. considered None.
* use_clang_covergae - a boolean indicating whether clang coverage should be * use_clang_coverage - a boolean indicating whether clang coverage should be
used. If True, the 'use_clang_coverage" field will be set in the used. If True, the 'use_clang_coverage" field will be set in the
'$build/code_coverage' property. By default, considered False. '$build/code_coverage' property. By default, considered False.
* use_java_covergae - a boolean indicating whether java coverage should be * use_java_coverage - a boolean indicating whether java coverage should be
used. If True, the 'use_java_coverage" field will be set in the used. If True, the 'use_java_coverage" field will be set in the
'$build/code_coverage' property. By default, considered False. '$build/code_coverage' property. By default, considered False.
* kwargs - Additional keyword arguments to forward on to `luci.builder`. * kwargs - Additional keyword arguments to forward on to `luci.builder`.
...@@ -274,13 +286,13 @@ def builder( ...@@ -274,13 +286,13 @@ def builder(
properties = kwargs.pop('properties', {}) properties = kwargs.pop('properties', {})
if '$kitchen' in properties: if '$kitchen' in properties:
fail('Explicitly specifying "$kitchen" property is not supported: ' fail('Setting "$kitchen" property is not supported: '
+ 'use configure_kitchen instead') + 'use configure_kitchen instead')
if '$build/goma' in properties: if '$build/goma' in properties:
fail('Explicitly specifying "$build/goma" property is not supported: ' fail('Setting "$build/goma" property is not supported: '
+ 'use goma_backend, goma_dbug, goma_enable_ats and goma_jobs instead') + 'use goma_backend, goma_dbug, goma_enable_ats and goma_jobs instead')
if '$build/code_coverage' in properties: if '$build/code_coverage' in properties:
fail('Explicitly specifying "$build/code_coverage" property is not supported: ' fail('Setting "$build/code_coverage" property is not supported: '
+ 'use use_clang_coverage and use_java_coverage instead') + 'use use_clang_coverage and use_java_coverage instead')
properties = dict(properties) properties = dict(properties)
......
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