From c3d35348069bb7a70c41e6389818bbd9a095c5db Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Tue, 17 Dec 2024 06:26:16 -0700 Subject: buildman: Add a way to build a particular target At present buildman only supports building the default target. Generally this is what is wanted, but in some cases boards erroneously have a different target for product extra files. Add a --target option to help. Also add a comment indicating which letters are free for new options. Signed-off-by: Simon Glass --- tools/buildman/func_test.py | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'tools/buildman/func_test.py') diff --git a/tools/buildman/func_test.py b/tools/buildman/func_test.py index b45eb95a1e6..d70849b47ab 100644 --- a/tools/buildman/func_test.py +++ b/tools/buildman/func_test.py @@ -1152,3 +1152,13 @@ CONFIG_SOC="fred" 'board': 'ARM Board 0', 'config': 'config0', 'target': 'board0'}, []), res) + + def testTarget(self): + """Test that the --target flag works""" + lines = self.check_command('--target', 'u-boot.dtb')[0] + + # It should not affect the defconfig line + self.assertNotIn(b'u-boot.dtb', lines[0]) + + # It should appear at the end of the build line + self.assertEqual(b'u-boot.dtb', lines[1].split()[-1]) -- cgit v1.2.3 From ae3695f691c6325f1a504ee3df7f22d75c7a0c96 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Tue, 29 Apr 2025 07:21:59 -0600 Subject: patman: Move capture_sys_output() into terminal and rename This function is sometimes useful outside tests. Also it can affect how terminal output is done, e.g. whether ANSI characters should be emitted or not. Move it out of the test_util package and into terminal. Signed-off-by: Simon Glass --- tools/buildman/func_test.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tools/buildman/func_test.py') diff --git a/tools/buildman/func_test.py b/tools/buildman/func_test.py index d70849b47ab..51c6855420e 100644 --- a/tools/buildman/func_test.py +++ b/tools/buildman/func_test.py @@ -670,7 +670,7 @@ Some images are invalid''' def testThreadExceptions(self): """Test that exceptions in threads are reported""" - with test_util.capture_sys_output() as (stdout, stderr): + with terminal.capture() as (stdout, stderr): self.assertEqual(102, self._RunControl('-o', self._output_dir, test_thread_exceptions=True)) self.assertIn( @@ -808,7 +808,7 @@ Some images are invalid''' # CONFIG_LOCALVERSION_AUTO is not set ''', cfg_data) - with test_util.capture_sys_output() as (stdout, stderr): + with terminal.capture() as (stdout, stderr): lines, cfg_data = self.check_command('-r', '-a', 'LOCALVERSION') self.assertIn(b'SOURCE_DATE_EPOCH=0', lines[0]) @@ -1032,14 +1032,14 @@ endif 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): + with terminal.capture() as (stdout, stderr): result = self._RunControl('-R', outfile, brds=None, get_builder=False) self.assertTrue(os.path.exists(outfile)) def test_print_prefix(self): """Test that we can print the toolchain prefix""" - with test_util.capture_sys_output() as (stdout, stderr): + with terminal.capture() as (stdout, stderr): result = self._RunControl('-A', 'board0') self.assertEqual('arm-\n', stdout.getvalue()) self.assertEqual('', stderr.getvalue()) @@ -1083,7 +1083,7 @@ endif def test_print_arch(self): """Test that we can print the board architecture""" - with test_util.capture_sys_output() as (stdout, stderr): + with terminal.capture() as (stdout, stderr): result = self._RunControl('--print-arch', 'board0') self.assertEqual('arm\n', stdout.getvalue()) self.assertEqual('', stderr.getvalue()) -- cgit v1.2.3