V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

buildman: Rename do_build to config_only 

This variable name is needlessly confusion. Adjust it to use a 'positive'
name instead.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2016-11-16 14:09:25 -07:00
parent 960421ecb3
commit a9401b2bc9
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/buildman/builderthread.py
View File

@ -110,7 +110,7 @@ class BuilderThread(threading.Thread):
return self.builder.do_make(commit, brd, stage, cwd, *args, return self.builder.do_make(commit, brd, stage, cwd, *args,
**kwargs) **kwargs)
def RunCommit(self, commit_upto, brd, work_dir, do_config, do_build, def RunCommit(self, commit_upto, brd, work_dir, do_config, config_only,
force_build, force_build_failures): force_build, force_build_failures):
"""Build a particular commit. """Build a particular commit.
@ -122,7 +122,7 @@ class BuilderThread(threading.Thread):
brd: Board object to build brd: Board object to build
work_dir: Directory to which the source will be checked out work_dir: Directory to which the source will be checked out
do_config: True to run a make <board>_defconfig on the source do_config: True to run a make <board>_defconfig on the source
do_build: Try to build the source config_only: Only configure the source, do not build it
force_build: Force a build even if one was previously done force_build: Force a build even if one was previously done
force_build_failures: Force a bulid if the previous result showed force_build_failures: Force a bulid if the previous result showed
failure failure
@ -232,7 +232,7 @@ class BuilderThread(threading.Thread):
config_out += result.combined config_out += result.combined
do_config = False # No need to configure next time do_config = False # No need to configure next time
if result.return_code == 0: if result.return_code == 0:
if not do_build: if config_only:
args.append('cfg') args.append('cfg')
result = self.Make(commit, brd, 'build', cwd, *args, result = self.Make(commit, brd, 'build', cwd, *args,
env=env) env=env)
@ -404,7 +404,7 @@ class BuilderThread(threading.Thread):
force_build = False force_build = False
for commit_upto in range(0, len(job.commits), job.step): for commit_upto in range(0, len(job.commits), job.step):
result, request_config = self.RunCommit(commit_upto, brd, result, request_config = self.RunCommit(commit_upto, brd,
work_dir, do_config, not self.builder.config_only, work_dir, do_config, self.builder.config_only,
force_build or self.builder.force_build, force_build or self.builder.force_build,
self.builder.force_build_failures) self.builder.force_build_failures)
failed = result.return_code or result.stderr failed = result.return_code or result.stderr
@ -458,7 +458,7 @@ class BuilderThread(threading.Thread):
else: else:
# Just build the currently checked-out build # Just build the currently checked-out build
result, request_config = self.RunCommit(None, brd, work_dir, True, result, request_config = self.RunCommit(None, brd, work_dir, True,
not self.builder.config_only, True, self.builder.config_only, True,
self.builder.force_build_failures) self.builder.force_build_failures)
result.commit_upto = 0 result.commit_upto = 0
self._WriteResult(result, job.keep_outputs) self._WriteResult(result, job.keep_outputs)