From 93a203d38b520db64e041e66f6bdad39ee5a3366 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 3 Aug 2023 17:23:58 -0600 Subject: [PATCH] binman: Renumber 291 and 292 test files These have ended up with the same numbers as earlier files. Fix them. Signed-off-by: Simon Glass --- tools/binman/ftest.py | 4 ++-- .../{291_template_phandle.dts => 309_template_phandle.dts} | 0 ..._template_phandle_dup.dts => 310_template_phandle_dup.dts} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename tools/binman/test/{291_template_phandle.dts => 309_template_phandle.dts} (100%) rename tools/binman/test/{292_template_phandle_dup.dts => 310_template_phandle_dup.dts} (100%) diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index 36428ec343..78389b34a7 100644 --- a/tools/binman/ftest.py +++ b/tools/binman/ftest.py @@ -6974,7 +6974,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap entry_args = { 'atf-bl31-path': 'bl31.elf', } - data = self._DoReadFileDtb('291_template_phandle.dts', + data = self._DoReadFileDtb('309_template_phandle.dts', entry_args=entry_args) fname = tools.get_output_filename('image.bin') out = tools.run('dumpimage', '-l', fname) @@ -6990,7 +6990,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap 'atf-bl31-path': 'bl31.elf', } with self.assertRaises(ValueError) as e: - self._DoReadFileDtb('292_template_phandle_dup.dts', + self._DoReadFileDtb('310_template_phandle_dup.dts', entry_args=entry_args) self.assertIn( 'Duplicate phandle 1 in nodes /binman/image/fit/images/atf/atf-bl31 and /binman/image-2/fit/images/atf/atf-bl31', diff --git a/tools/binman/test/291_template_phandle.dts b/tools/binman/test/309_template_phandle.dts similarity index 100% rename from tools/binman/test/291_template_phandle.dts rename to tools/binman/test/309_template_phandle.dts diff --git a/tools/binman/test/292_template_phandle_dup.dts b/tools/binman/test/310_template_phandle_dup.dts similarity index 100% rename from tools/binman/test/292_template_phandle_dup.dts rename to tools/binman/test/310_template_phandle_dup.dts -- 2.39.5