diff options
Diffstat (limited to 'tools/dtoc')
| -rwxr-xr-x | tools/dtoc/main.py | 5 | ||||
| -rwxr-xr-x | tools/dtoc/test_dtoc.py | 11 | ||||
| -rwxr-xr-x | tools/dtoc/test_fdt.py | 2 | ||||
| -rw-r--r-- | tools/dtoc/test_src_scan.py | 25 |
4 files changed, 23 insertions, 20 deletions
diff --git a/tools/dtoc/main.py b/tools/dtoc/main.py index 6c91450410e..59b98b0fa9f 100755 --- a/tools/dtoc/main.py +++ b/tools/dtoc/main.py @@ -58,8 +58,9 @@ def run_tests(processes, args): test_dtoc.setup() result = test_util.run_test_suites( - toolname='dtoc', debug=True, verbosity=1, test_preserve_dirs=False, - processes=processes, test_name=test_name, toolpath=[], + toolname='dtoc', debug=True, verbosity=1, no_capture=False, + test_preserve_dirs=False, processes=processes, test_name=test_name, + toolpath=[], class_and_module_list=[test_dtoc.TestDtoc,test_src_scan.TestSrcScan]) return (0 if result.wasSuccessful() else 1) diff --git a/tools/dtoc/test_dtoc.py b/tools/dtoc/test_dtoc.py index c4a0889aebe..1a85ebcf81a 100755 --- a/tools/dtoc/test_dtoc.py +++ b/tools/dtoc/test_dtoc.py @@ -26,6 +26,7 @@ from dtoc.dtb_platdata import get_value from dtoc.dtb_platdata import tab_to from dtoc.src_scan import conv_name_to_c from dtoc.src_scan import get_compat_name +from u_boot_pylib import terminal from u_boot_pylib import test_util from u_boot_pylib import tools @@ -879,7 +880,7 @@ U_BOOT_DRVINFO(gpios_at_0) = { """Test output from a device tree file with an invalid driver""" dtb_file = get_dtb_file('dtoc_test_invalid_driver.dts') output = tools.get_output_filename('output') - with test_util.capture_sys_output() as _: + with terminal.capture() as _: dtb_platdata.run_steps( ['struct'], dtb_file, False, output, [], None, False, scan=copy_scan()) @@ -890,7 +891,7 @@ struct dtd_invalid { }; ''', data) - with test_util.capture_sys_output() as _: + with terminal.capture() as _: dtb_platdata.run_steps( ['platdata'], dtb_file, False, output, [], None, False, scan=copy_scan()) @@ -1522,7 +1523,7 @@ U_BOOT_DRVINFO(spl_test2) = { def test_stdout(self): """Test output to stdout""" dtb_file = get_dtb_file('dtoc_test_simple.dts') - with test_util.capture_sys_output() as (stdout, _): + with terminal.capture() as (stdout, _): self.run_test(['struct'], dtb_file, None) self._check_strings(self.struct_text, stdout.getvalue()) @@ -1744,7 +1745,7 @@ U_BOOT_DRVINFO(spl_test2) = { """Test alias for a uclass that doesn't exist""" dtb_file = get_dtb_file('dtoc_test_alias_bad_uc.dts') output = tools.get_output_filename('output') - with test_util.capture_sys_output() as (stdout, _): + with terminal.capture() as (stdout, _): plat = self.run_test(['struct'], dtb_file, output) self.assertEqual("Could not find uclass for alias 'other1'", stdout.getvalue().strip()) @@ -1821,7 +1822,7 @@ U_BOOT_DRVINFO(spl_test2) = { del scan._structs['dm_test_uc_priv'] # Now generate the uclasses, which should provide a warning - with test_util.capture_sys_output() as (stdout, _): + with terminal.capture() as (stdout, _): plat.generate_uclasses() self.assertEqual( 'Warning: Cannot find header file for struct dm_test_uc_priv', diff --git a/tools/dtoc/test_fdt.py b/tools/dtoc/test_fdt.py index 0b01518f3a5..a0bed4e18bb 100755 --- a/tools/dtoc/test_fdt.py +++ b/tools/dtoc/test_fdt.py @@ -969,7 +969,7 @@ def run_tests(names, processes): """ test_name = names[0] if names else None result = test_util.run_test_suites( - 'test_fdt', False, False, False, processes, test_name, None, + 'test_fdt', False, False, False, False, processes, test_name, None, [TestFdt, TestNode, TestProp, TestFdtUtil]) return (0 if result.wasSuccessful() else 1) diff --git a/tools/dtoc/test_src_scan.py b/tools/dtoc/test_src_scan.py index 64b740841ca..385efedc851 100644 --- a/tools/dtoc/test_src_scan.py +++ b/tools/dtoc/test_src_scan.py @@ -15,6 +15,7 @@ import unittest from unittest import mock from dtoc import src_scan +from u_boot_pylib import terminal from u_boot_pylib import test_util from u_boot_pylib import tools @@ -80,7 +81,7 @@ class TestSrcScan(unittest.TestCase): fout.write(b'\x81') scan = src_scan.Scanner(None, [driver_fn]) - with test_util.capture_sys_output() as (stdout, _): + with terminal.capture() as (stdout, _): scan.scan_drivers() self.assertRegex(stdout.getvalue(), r"Skipping file '.*' due to unicode error\s*") @@ -170,7 +171,7 @@ class TestSrcScan(unittest.TestCase): node.parent = FakeNode() scan = src_scan.Scanner(None, None) - with test_util.capture_sys_output() as (stdout, _): + with terminal.capture() as (stdout, _): name, aliases = scan.get_normalized_compat_name(node) self.assertEqual('rockchip_rk3288_grf', name) self.assertEqual([], aliases) @@ -189,7 +190,7 @@ class TestSrcScan(unittest.TestCase): scan._driver_aliases['rockchip_rk3288_srf'] = 'rockchip_rk3288_grf' - with test_util.capture_sys_output() as (stdout, _): + with terminal.capture() as (stdout, _): name, aliases = scan.get_normalized_compat_name(node) self.assertEqual('', stdout.getvalue().strip()) self.assertEqual('rockchip_rk3288_grf', name) @@ -197,7 +198,7 @@ class TestSrcScan(unittest.TestCase): self.assertEqual(EXPECT_WARN, scan._warnings) prop.value = 'rockchip,rk3288-srf' - with test_util.capture_sys_output() as (stdout, _): + with terminal.capture() as (stdout, _): name, aliases = scan.get_normalized_compat_name(node) self.assertEqual('', stdout.getvalue().strip()) self.assertEqual('rockchip_rk3288_grf', name) @@ -379,7 +380,7 @@ struct another_struct { tools.write_file(output, b'struct this is a test \x81 of bad unicode') scan = src_scan.Scanner(None, None) - with test_util.capture_sys_output() as (stdout, _): + with terminal.capture() as (stdout, _): scan.scan_header(output) self.assertIn('due to unicode error', stdout.getvalue()) @@ -456,7 +457,7 @@ U_BOOT_DRIVER(%s) = { self.assertTrue(drv2.warn_dups) # We should see a warning - with test_util.capture_sys_output() as (stdout, _): + with terminal.capture() as (stdout, _): scan.mark_used([node]) self.assertEqual( "Warning: Duplicate driver name 'nvidia_tegra114_i2c' (orig=file2.c, dups=file1.c)", @@ -477,7 +478,7 @@ U_BOOT_DRIVER(%s) = { self.assertFalse(drv1.warn_dups) # We should not see a warning - with test_util.capture_sys_output() as (stdout, _): + with terminal.capture() as (stdout, _): scan.mark_used([node]) self.assertEqual('', stdout.getvalue().strip()) @@ -539,7 +540,7 @@ U_BOOT_DRIVER(i2c_tegra) = { # get_normalized_compat_name() uses this to check for root node tnode.parent = FakeNode() - with test_util.capture_sys_output() as (stdout, _): + with terminal.capture() as (stdout, _): scan.get_normalized_compat_name(node) scan.get_normalized_compat_name(tnode) self.assertEqual('', stdout.getvalue().strip()) @@ -547,14 +548,14 @@ U_BOOT_DRIVER(i2c_tegra) = { self.assertEqual(2, len(scan._missing_drivers)) self.assertEqual({'rockchip_rk3288_grf', 'nvidia_tegra114_i2c'}, scan._missing_drivers) - with test_util.capture_sys_output() as (stdout, _): + with terminal.capture() as (stdout, _): scan.show_warnings() self.assertIn('rockchip_rk3288_grf', stdout.getvalue()) # This should show just the rockchip warning, since the tegra driver # is not in self._missing_drivers scan._missing_drivers.remove('nvidia_tegra114_i2c') - with test_util.capture_sys_output() as (stdout, _): + with terminal.capture() as (stdout, _): scan.show_warnings() self.assertIn('rockchip_rk3288_grf', stdout.getvalue()) self.assertNotIn('tegra_i2c_ids', stdout.getvalue()) @@ -563,7 +564,7 @@ U_BOOT_DRIVER(i2c_tegra) = { # used, the warning related to that driver will be shown drv = scan._drivers['i2c_tegra'] drv.used = True - with test_util.capture_sys_output() as (stdout, _): + with terminal.capture() as (stdout, _): scan.show_warnings() self.assertIn('rockchip_rk3288_grf', stdout.getvalue()) self.assertIn('tegra_i2c_ids', stdout.getvalue()) @@ -572,7 +573,7 @@ U_BOOT_DRIVER(i2c_tegra) = { scan._warnings['i2c_tegra'].update( scan._warnings['nvidia_tegra114_i2c']) del scan._warnings['nvidia_tegra114_i2c'] - with test_util.capture_sys_output() as (stdout, _): + with terminal.capture() as (stdout, _): scan.show_warnings() self.assertEqual('''i2c_tegra: WARNING: the driver nvidia_tegra114_i2c was not found in the driver list : file.c: Warning: unexpected suffix ' + 1' on .of_match line for compat 'tegra_i2c_ids' |