This commit makes sure boards.cfg is up to date before starting the build tests. tools/genboardscfg.py exits immediately printing "boards.cfg is up to date. Nothing to do." when boards.cfg is already new.

Signed-off-by: Masahiro Yamada yamada.m@jp.panasonic.com ---

MAKEALL | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/MAKEALL b/MAKEALL index 2e826c1..4822054 100755 --- a/MAKEALL +++ b/MAKEALL @@ -171,13 +171,10 @@ GNU_MAKE=$(scripts/show-gnu-make) || { # echo "Remaining arguments:" # for arg do echo '--> '"`$arg'" ; done

-if [ ! -r boards.cfg ]; then - echo "Could not find boards.cfg" - tools/genboardscfg.py || { - echo "Failed to generate boards.cfg" >&2 - exit 1 - } -fi +tools/genboardscfg.py || { + echo "Failed to generate boards.cfg" >&2 + exit 1 +}

FILTER="$1 !~ /^#/" [ "$opt_a" ] && FILTER="${FILTER} && $opt_a"

This commit makes sure boards.cfg is up to date before starting the build tests. tools/genboardscfg.py exits immediately printing "boards.cfg is up to date. Nothing to do." when boards.cfg is already new.

Signed-off-by: Masahiro Yamada yamada.m@jp.panasonic.com ---

tools/buildman/control.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/tools/buildman/control.py b/tools/buildman/control.py index d98e50a..68ea961 100644 --- a/tools/buildman/control.py +++ b/tools/buildman/control.py @@ -120,12 +120,10 @@ def DoBuildman(options, args):

# Work out what subset of the boards we are building board_file = os.path.join(options.git, 'boards.cfg') - if not os.path.exists(board_file): - print 'Could not find %s' % board_file - status = subprocess.call([os.path.join(options.git, - 'tools/genboardscfg.py')]) - if status != 0: - sys.exit("Failed to generate boards.cfg") + status = subprocess.call([os.path.join(options.git, + 'tools/genboardscfg.py')]) + if status != 0: + sys.exit("Failed to generate boards.cfg")

boards = board.Boards() boards.ReadBoards(os.path.join(options.git, 'boards.cfg'))