diff options
author | Simon Glass <sjg@chromium.org> | 2023-10-26 14:31:10 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2023-11-07 14:48:19 -0500 |
commit | dc314185be49bfceb63591bd38b14f28ccf9f9fb (patch) | |
tree | 011298e1bce438f28a0aa6e0607ab95134974299 /tools/buildman/func_test.py | |
parent | 3af0e9556c968fc2c40e3778d8f1e668a90af92e (diff) |
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 <sjg@chromium.org>
Diffstat (limited to 'tools/buildman/func_test.py')
-rw-r--r-- | tools/buildman/func_test.py | 4 |
1 files changed, 3 insertions, 1 deletions
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 |