Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-05-08 19:11:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

tools: moveconfig: refactor code to go back to idle state

Browse source 
Move similar code to finish() function.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Joe Hershberger <joe.hershberger@ni.com>
This commit is contained in:
Masahiro Yamada 2016-05-19 15:52:03 +09:00
parent 1d085568b3
commit 4efef998cd
1 changed files with 17 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

37
tools/moveconfig.py
View file

@ -632,13 +632,7 @@ class Slot:
if self.options.verbose: if self.options.verbose:
self.log += color_text(self.options.color, COLOR_LIGHT_CYAN, self.log += color_text(self.options.color, COLOR_LIGHT_CYAN,
self.ps.stderr.read()) self.ps.stderr.read())
self.show_log(sys.stderr) self.finish(False)
if self.options.exit_on_error:
sys.exit("Exit on error.")
# If --exit-on-error flag is not set, skip this board and continue.
# Record the failed board.
self.failed_boards.append(self.defconfig)
self.state = STATE_IDLE
return True return True
if self.state == STATE_AUTOCONF: if self.state == STATE_AUTOCONF:
@ -656,21 +650,14 @@ class Slot:
if not self.options.dry_run: if not self.options.dry_run:
shutil.move(os.path.join(self.build_dir, 'defconfig'), shutil.move(os.path.join(self.build_dir, 'defconfig'),
os.path.join('configs', self.defconfig)) os.path.join('configs', self.defconfig))
self.show_log() self.finish(True)
self.state = STATE_IDLE
return True return True
self.cross_compile = self.parser.get_cross_compile() self.cross_compile = self.parser.get_cross_compile()
if self.cross_compile is None: if self.cross_compile is None:
self.log += color_text(self.options.color, COLOR_YELLOW, self.log += color_text(self.options.color, COLOR_YELLOW,
"Compiler is missing. Do nothing.\n") "Compiler is missing. Do nothing.\n")
self.show_log(sys.stderr) self.finish(False)
if self.options.exit_on_error:
sys.exit("Exit on error.")
# If --exit-on-error flag is not set, skip this board and continue.
# Record the failed board.
self.failed_boards.append(self.defconfig)
self.state = STATE_IDLE
return True return True
cmd = list(self.make_cmd) cmd = list(self.make_cmd)
@ -683,11 +670,12 @@ class Slot:
self.state = STATE_AUTOCONF self.state = STATE_AUTOCONF
return False return False
def show_log(self, file=sys.stdout): def finish(self, success):
"""Display log along with progress. """Display log along with progress and go to the idle state.
Arguments: Arguments:
file: A file object to which the log string is sent. success: Should be True when the defconfig was processed
successfully, or False when it fails.
""" """
# output at least 30 characters to hide the "* defconfigs out of *". # output at least 30 characters to hide the "* defconfigs out of *".
log = self.defconfig.ljust(30) + '\n' log = self.defconfig.ljust(30) + '\n'
@ -695,9 +683,18 @@ class Slot:
log += '\n'.join([ ' ' + s for s in self.log.split('\n') ]) log += '\n'.join([ ' ' + s for s in self.log.split('\n') ])
# Some threads are running in parallel. # Some threads are running in parallel.
# Print log atomically to not mix up logs from different threads. # Print log atomically to not mix up logs from different threads.
print >> file, log print >> (sys.stdout if success else sys.stderr), log
if not success:
if self.options.exit_on_error:
sys.exit("Exit on error.")
# If --exit-on-error flag is not set, skip this board and continue.
# Record the failed board.
self.failed_boards.append(self.defconfig)
self.progress.inc() self.progress.inc()
self.progress.show() self.progress.show()
self.state = STATE_IDLE
def get_failed_boards(self): def get_failed_boards(self):
"""Returns a list of failed boards (defconfigs) in this slot. """Returns a list of failed boards (defconfigs) in this slot.