Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-29 08:01:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

dtoc: Test the stdout output

Browse source 
Normally dtoc outputs to a file but it also offers a way to write output
to stdout. At present the test for that does not actually check that the
output is correct. Add this to the test.

This uses a member variable to hold the expected text, so it can be used
in muitiple places.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2020-12-28 20:34:49 -07:00
parent f62cea0e20
commit de846cbb30
1 changed files with 22 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
tools/dtoc/test_dtoc.py
View file

@ -188,14 +188,7 @@ class TestDtoc(unittest.TestCase):
self.assertEqual(C_HEADER.splitlines() + [''] + self.assertEqual(C_HEADER.splitlines() + [''] +
C_EMPTY_POPULATE_PHANDLE_DATA.splitlines(), lines) C_EMPTY_POPULATE_PHANDLE_DATA.splitlines(), lines)
def test_simple(self): struct_text = HEADER + '''
"""Test output from some simple nodes with various types of data"""
dtb_file = get_dtb_file('dtoc_test_simple.dts')
output = tools.GetOutputFilename('output')
self.run_test(['struct'], dtb_file, output)
with open(output) as infile:
data = infile.read()
self._check_strings(HEADER + '''
struct dtd_sandbox_i2c_test { struct dtd_sandbox_i2c_test {
}; };
struct dtd_sandbox_pmic_test { struct dtd_sandbox_pmic_test {
@ -214,12 +207,9 @@ struct dtd_sandbox_spl_test {
\tconst char *\tstringarray[3]; \tconst char *\tstringarray[3];
\tconst char *\tstringval; \tconst char *\tstringval;
}; };
''', data) '''
self.run_test(['platdata'], dtb_file, output) platdata_text = C_HEADER + '''
with open(output) as infile:
data = infile.read()
self._check_strings(C_HEADER + '''
/* Node /i2c@0 index 0 */ /* Node /i2c@0 index 0 */
static struct dtd_sandbox_i2c_test dtv_i2c_at_0 = { static struct dtd_sandbox_i2c_test dtv_i2c_at_0 = {
}; };
@ -294,7 +284,23 @@ U_BOOT_DEVICE(spl_test3) = {
\t.parent_idx\t= -1, \t.parent_idx\t= -1,
}; };
''' + C_EMPTY_POPULATE_PHANDLE_DATA, data) ''' + C_EMPTY_POPULATE_PHANDLE_DATA
def test_simple(self):
"""Test output from some simple nodes with various types of data"""
dtb_file = get_dtb_file('dtoc_test_simple.dts')
output = tools.GetOutputFilename('output')
self.run_test(['struct'], dtb_file, output)
with open(output) as infile:
data = infile.read()
self._check_strings(self.struct_text, data)
self.run_test(['platdata'], dtb_file, output)
with open(output) as infile:
data = infile.read()
self._check_strings(self.platdata_text, data)
def test_driver_alias(self): def test_driver_alias(self):
"""Test output from a device tree file with a driver alias""" """Test output from a device tree file with a driver alias"""
@ -874,8 +880,9 @@ U_BOOT_DEVICE(spl_test2) = {
def test_stdout(self): def test_stdout(self):
"""Test output to stdout""" """Test output to stdout"""
dtb_file = get_dtb_file('dtoc_test_simple.dts') dtb_file = get_dtb_file('dtoc_test_simple.dts')
with test_util.capture_sys_output() as _: with test_util.capture_sys_output() as (stdout, _):
self.run_test(['struct'], dtb_file, None) self.run_test(['struct'], dtb_file, None)
self._check_strings(self.struct_text, stdout.getvalue())
def test_no_command(self): def test_no_command(self):
"""Test running dtoc without a command""" """Test running dtoc without a command"""