mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2026-05-05 12:46:14 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

buildman: Move full-help processing to main

Browse Source 
This does not need any of the control features. Move it out of main to
reduce the size of the do_buildman() function.

For Python 3.6 the -H feature will not work, but this does not seem to be
a huge problem, as it dates from 2016.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2023-07-19 17:48:32 -06:00
parent b8be2bd831
commit 309f0f15c9
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/buildman/control.py
View File

@ -8,11 +8,6 @@ This holds the main control logic for buildman, when not running tests.
"""
import multiprocessing
try:
import importlib.resources
except ImportError:
# for Python 3.6
import importlib_resources
import os
import shutil
import sys
@ -26,7 +21,6 @@ from patman import gitutil
from patman import patchstream
from u_boot_pylib import command
from u_boot_pylib import terminal
from u_boot_pylib import tools
from u_boot_pylib.terminal import tprint
TEST_BUILDER = None
@ -177,11 +171,6 @@ def do_buildman(options, args, toolchains=None, make_func=None, brds=None,
# Used so testing can obtain the builder: pylint: disable=W0603
global TEST_BUILDER
if options.full_help:
with importlib.resources.path('buildman', 'README.rst') as readme:
tools.print_full_help(str(readme))
return 0
gitutil.setup()
col = terminal.Color()

9
tools/buildman/main.py
View File

@ -6,6 +6,11 @@
"""See README for more information"""
try:
from importlib.resources import files
except ImportError:
# for Python 3.6
import importlib_resources
import os
import sys
@ -19,6 +24,7 @@ from buildman import bsettings
from buildman import cmdline
from buildman import control
from u_boot_pylib import test_util
from u_boot_pylib import tools
def run_tests(skip_net_tests, debug, verbose, args):
"""Run the buildman tests
@ -64,6 +70,9 @@ def run_buildman():
return run_tests(options.skip_net_tests, options.debug, options.verbose,
args)
elif options.full_help:
tools.print_full_help(str(files('buildman').joinpath('README.rst')))
# Build selected commits for selected boards
else:
bsettings.Setup(options.config_file)