tools: moveconfig: show suspicious boards with possible misconversion

There are some cases where config options are moved, but they are
ripped off at the final savedefconfig stage:

  - The moved option is not user-configurable, for example, due to
    a missing prompt in the Kconfig entry

  - The config was not defined in the original config header despite
    the Kconfig specifies it as non-bool type

  - The config define in the header contains reference to another
    macro, for example:
        #define CONFIG_CONS_INDEX     (CONFIG_SYS_LPC32XX_UART - 2)
    The current moveconfig does not support recursive macro expansion.

In these cases, the conversion is very likely to be an unexpected
result.  That is why I decided to display the log in yellow color
in commit 5da4f857be ("tools: moveconfig: report when CONFIGs are
removed by savedefconfig").

It would be nice to display the list of suspicious boards when the
tool finishes processing.  It is highly recommended to check the
defconfigs once again when this message is displayed.

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-06-15 14:33:54 +09:00
parent 96dccd9767
commit fc2661eebe
1 changed files with 31 additions and 1 deletions

View File

@ -611,6 +611,7 @@ class Slot:
self.parser = KconfigParser(configs, options, self.build_dir)
self.state = STATE_IDLE
self.failed_boards = []
self.suspicious_boards = []
def __del__(self):
"""Delete the working directory
@ -755,7 +756,10 @@ class Slot:
def update_defconfig(self):
"""Update the input defconfig and go back to the idle state."""
self.log += self.parser.check_defconfig()
log = self.parser.check_defconfig()
if log:
self.suspicious_boards.append(self.defconfig)
self.log += log
orig_defconfig = os.path.join('configs', self.defconfig)
new_defconfig = os.path.join(self.build_dir, 'defconfig')
updated = not filecmp.cmp(orig_defconfig, new_defconfig)
@ -799,6 +803,11 @@ class Slot:
"""
return self.failed_boards
def get_suspicious_boards(self):
"""Returns a list of boards (defconfigs) with possible misconversion.
"""
return self.suspicious_boards
class Slots:
"""Controller of the array of subprocess slots."""
@ -877,6 +886,26 @@ class Slots:
with open(output_file, 'w') as f:
f.write(boards)
def show_suspicious_boards(self):
"""Display all boards (defconfigs) with possible misconversion."""
boards = []
output_file = 'moveconfig.suspicious'
for slot in self.slots:
boards += slot.get_suspicious_boards()
if boards:
boards = '\n'.join(boards) + '\n'
msg = "The following boards might have been converted incorrectly.\n"
msg += "It is highly recommended to check them manually:\n"
msg += boards
msg += "(the list has been saved in %s)\n" % output_file
print >> sys.stderr, color_text(self.options.color, COLOR_YELLOW,
msg)
with open(output_file, 'w') as f:
f.write(boards)
class ReferenceSource:
"""Reference source against which original configs should be parsed."""
@ -967,6 +996,7 @@ def move_config(configs, options):
print ''
slots.show_failed_boards()
slots.show_suspicious_boards()
def main():
try: