From dc314185be49bfceb63591bd38b14f28ccf9f9fb Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 26 Oct 2023 14:31:10 -0400 Subject: buildman: Use oldconfig when adjusting the config We cannot be sure that the new config is consistent, particularly when changing a major item like CONFIG_CMDLINE. Use 'make oldconfig' to check that and avoid any such problems. Signed-off-by: Simon Glass --- tools/buildman/func_test.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'tools/buildman/func_test.py') diff --git a/tools/buildman/func_test.py b/tools/buildman/func_test.py index 55dd494fe8..6b88ed815d 100644 --- a/tools/buildman/func_test.py +++ b/tools/buildman/func_test.py @@ -439,6 +439,8 @@ class TestFunctional(unittest.TestCase): tools.write_file(fname, b'CONFIG_SOMETHING=1') return command.CommandResult(return_code=0, combined='Test configuration complete') + elif stage == 'oldconfig': + return command.CommandResult(return_code=0) elif stage == 'build': stderr = '' fname = os.path.join(cwd or '', out_dir, 'u-boot') @@ -461,7 +463,7 @@ Some images are invalid''' return command.CommandResult(return_code=0) # Not handled, so abort - print('make', stage) + print('_HandleMake failure: make', stage) sys.exit(1) # Example function to print output lines -- cgit v1.2.3