colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

binman: Renumber 291 and 292 test files

Browse Source 
These have ended up with the same numbers as earlier files. Fix them.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2023-08-03 17:23:58 -06:00
parent 9787da0d32
commit 93a203d38b
3 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/binman/ftest.py
View File

@@ -6974,7 +6974,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap
entry_args = { entry_args = {
'atf-bl31-path': 'bl31.elf', 'atf-bl31-path': 'bl31.elf',
} }
data = self._DoReadFileDtb('291_template_phandle.dts', data = self._DoReadFileDtb('309_template_phandle.dts',
entry_args=entry_args) entry_args=entry_args)
fname = tools.get_output_filename('image.bin') fname = tools.get_output_filename('image.bin')
out = tools.run('dumpimage', '-l', fname) out = tools.run('dumpimage', '-l', fname)
@@ -6990,7 +6990,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap
'atf-bl31-path': 'bl31.elf', 'atf-bl31-path': 'bl31.elf',
} }
with self.assertRaises(ValueError) as e: with self.assertRaises(ValueError) as e:
self._DoReadFileDtb('292_template_phandle_dup.dts', self._DoReadFileDtb('310_template_phandle_dup.dts',
entry_args=entry_args) entry_args=entry_args)
self.assertIn( self.assertIn(
'Duplicate phandle 1 in nodes /binman/image/fit/images/atf/atf-bl31 and /binman/image-2/fit/images/atf/atf-bl31', 'Duplicate phandle 1 in nodes /binman/image/fit/images/atf/atf-bl31 and /binman/image-2/fit/images/atf/atf-bl31',

0
tools/binman/test/291_template_phandle.dts → tools/binman/test/309_template_phandle.dts
View File

0
tools/binman/test/292_template_phandle_dup.dts → tools/binman/test/310_template_phandle_dup.dts
View File