diff options
author | Simon Glass <sjg@chromium.org> | 2022-01-22 15:07:30 +0300 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2022-02-09 07:07:59 +0300 |
commit | d10dc4028373a177b006283b93d5c245428fe774 (patch) | |
tree | 681f029a3541e9a9fcbce1012c4a2904b38978cf /tools/buildman | |
parent | 433fa549e138a06085fe3a9a0ac4924bb1804687 (diff) | |
download | u-boot-d10dc4028373a177b006283b93d5c245428fe774.tar.xz |
buildman: Make use of test_util
Use test_util to run the tests, with the ability to select a single test
to run, if desired.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'tools/buildman')
-rwxr-xr-x | tools/buildman/main.py | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/tools/buildman/main.py b/tools/buildman/main.py index 04698ce9e5..c6af311a69 100755 --- a/tools/buildman/main.py +++ b/tools/buildman/main.py @@ -27,30 +27,26 @@ from buildman import toolchain from patman import patchstream from patman import gitutil from patman import terminal +from patman import test_util -def RunTests(skip_net_tests): +def RunTests(skip_net_tests, verboose, args): import func_test import test import doctest result = unittest.TestResult() - for module in ['buildman.toolchain', 'patman.gitutil']: - suite = doctest.DocTestSuite(module) - suite.run(result) - - sys.argv = [sys.argv[0]] + test_name = args and args[0] or None if skip_net_tests: test.use_network = False - for module in (test.TestBuild, func_test.TestFunctional): - suite = unittest.TestLoader().loadTestsFromTestCase(module) - suite.run(result) - print(result) - for test, err in result.errors: - print(err) - for test, err in result.failures: - print(err) + # Run the entry tests first ,since these need to be the first to import the + # 'entry' module. + test_util.RunTestSuites( + result, False, verboose, False, None, test_name, [], + [test.TestBuild, func_test.TestFunctional, + 'buildman.toolchain', 'patman.gitutil']) + return test_util.ReportResult('buildman', test_name, result) options, args = cmdline.ParseArgs() @@ -59,7 +55,7 @@ if not options.debug: # Run our meagre tests if options.test: - RunTests(options.skip_net_tests) + RunTests(options.skip_net_tests, options.verbose, args) # Build selected commits for selected boards else: |