From a1431e6c97ab0d3c7be4327c8089a501d80e2c77 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Wed, 19 Jul 2023 17:48:28 -0600 Subject: [PATCH] buildman: Provide an argument to the -R option Allow writing the file to a selected location, since otherwise this is controlled by the buildman configuration, so cannot be determined by the caller. Signed-off-by: Simon Glass Fixes: https://source.denx.de/u-boot/u-boot/-/issues/17 --- tools/buildman/buildman.rst | 7 ++++--- tools/buildman/cmdline.py | 2 +- tools/buildman/control.py | 2 ++ tools/buildman/func_test.py | 25 +++++++++++++++++++------ 4 files changed, 26 insertions(+), 10 deletions(-) diff --git a/tools/buildman/buildman.rst b/tools/buildman/buildman.rst index ebc552fae3..a94957ba31 100644 --- a/tools/buildman/buildman.rst +++ b/tools/buildman/buildman.rst @@ -1303,9 +1303,10 @@ Using boards.cfg This file is no-longer needed by buildman but it is still generated in the working directory. This helps avoid a delay on every build, since scanning all -the Kconfig files takes a few seconds. Use the -R flag to force regeneration -of the file - in that case buildman exits after writing the file. with exit code -2 if there was an error in the maintainer files. +the Kconfig files takes a few seconds. Use the `-R ` flag to force +regeneration of the file - in that case buildman exits after writing the file +with exit code 2 if there was an error in the maintainer files. To use the +default filename, use a hyphen, i.e. `-R -`. You should use 'buildman -nv ' instead of greoing the boards.cfg file, since it may be dropped altogether in future. diff --git a/tools/buildman/cmdline.py b/tools/buildman/cmdline.py index 36acac5ee5..7918195bcb 100644 --- a/tools/buildman/cmdline.py +++ b/tools/buildman/cmdline.py @@ -106,7 +106,7 @@ def ParseArgs(): default=False, help="Use an O= (output) directory per board rather than per thread") parser.add_option('-r', '--reproducible-builds', action='store_true', help='Set SOURCE_DATE_EPOCH=0 to suuport a reproducible build') - parser.add_option('-R', '--regen-board-list', action='store_true', + parser.add_option('-R', '--regen-board-list', type='string', help='Force regeneration of the list of boards, like the old boards.cfg file') parser.add_option('-s', '--summary', action='store_true', default=False, help='Show a build summary') diff --git a/tools/buildman/control.py b/tools/buildman/control.py index fc9e926d3a..89010eac3a 100644 --- a/tools/buildman/control.py +++ b/tools/buildman/control.py @@ -209,6 +209,8 @@ def DoBuildman(options, args, toolchains=None, make_func=None, brds=None, if not os.path.exists(options.output_dir): os.makedirs(options.output_dir) board_file = os.path.join(options.output_dir, 'boards.cfg') + if options.regen_board_list and options.regen_board_list != '-': + board_file = options.regen_board_list brds = boards.Boards() if options.maintainer_check: diff --git a/tools/buildman/func_test.py b/tools/buildman/func_test.py index 7f3d54cc76..e6cdebdbd1 100644 --- a/tools/buildman/func_test.py +++ b/tools/buildman/func_test.py @@ -233,29 +233,33 @@ class TestFunctional(unittest.TestCase): return command.run_pipe([[self._buildman_pathname] + list(args)], capture=True, capture_stderr=True) - def _RunControl(self, *args, brds=None, clean_dir=False, - test_thread_exceptions=False): + def _RunControl(self, *args, brds=False, clean_dir=False, + test_thread_exceptions=False, get_builder=True): """Run buildman Args: args: List of arguments to pass - brds: Boards object + brds: Boards object, or False to pass self._boards, or None to pass + None clean_dir: Used for tests only, indicates that the existing output_dir should be removed before starting the build test_thread_exceptions: Uses for tests only, True to make the threads raise an exception instead of reporting their result. This simulates a failure in the code somewhere + get_builder (bool): Set self._builder to the resulting builder Returns: result code from buildman """ sys.argv = [sys.argv[0]] + list(args) options, args = cmdline.ParseArgs() + if brds == False: + brds = self._boards result = control.DoBuildman(options, args, toolchains=self._toolchains, - make_func=self._HandleMake, brds=brds or self._boards, - clean_dir=clean_dir, + make_func=self._HandleMake, brds=brds, clean_dir=clean_dir, test_thread_exceptions=test_thread_exceptions) - self._builder = control.builder + if get_builder: + self._builder = control.builder return result def testFullHelp(self): @@ -1002,3 +1006,12 @@ endif self.assertEquals(2, len(params_list)) self.assertFalse(warnings) + def testRegenBoards(self): + """Test that we can regenerate the boards.cfg file""" + outfile = os.path.join(self._output_dir, 'test-boards.cfg') + if os.path.exists(outfile): + os.remove(outfile) + with test_util.capture_sys_output() as (stdout, stderr): + result = self._RunControl('-R', outfile, brds=None, + get_builder=False) + self.assertTrue(os.path.exists(outfile)) -- 2.39.5