binman: Tidy up execution of tests
Move all the test execution into the same mechanism so that we can request
a particular test (from any suite) by passing it as an argument to
'binman -t'.
Signed-off-by: Simon Glass <sjg@chromium.org>
diff --git a/tools/binman/binman.py b/tools/binman/binman.py
index 944fd5d..74862b1 100755
--- a/tools/binman/binman.py
+++ b/tools/binman/binman.py
@@ -54,14 +54,12 @@
# Run the entry tests first ,since these need to be the first to import the
# 'entry' module.
- suite = unittest.TestLoader().loadTestsFromTestCase(entry_test.TestEntry)
- suite.run(result)
test_name = args and args[0] or None
- for module in (ftest.TestFunctional, fdt_test.TestFdt, elf_test.TestElf,
- image_test.TestImage):
+ for module in (entry_test.TestEntry, ftest.TestFunctional, fdt_test.TestFdt,
+ elf_test.TestElf, image_test.TestImage):
if test_name:
try:
- suite = unittest.TestLoader().loadTestsFromName(args[0], module)
+ suite = unittest.TestLoader().loadTestsFromName(test_name, module)
except AttributeError:
continue
else: