From: Simon Glass <[email protected]> Quite a few test files reuse number prefixes that already exist in the test numbering. Test .dts files are supposed to start with unique numbers.
Renumber conflicting files and update the references in ftest.py Signed-off-by: Simon Glass <[email protected]> --- tools/binman/ftest.py | 26 +++++++++---------- .../test/{225_ti_dm.dts => 351_ti_dm.dts} | 0 ...g_phony.dts => 352_ti_board_cfg_phony.dts} | 0 ...drfw_imx95.dts => 353_nxp_ddrfw_imx95.dts} | 0 .../binman/test/{347_bl1.dts => 354_bl1.dts} | 0 ...> 355_key_name_hint_dir_fit_signature.dts} | 0 ... 356_key_name_hint_dir_spl_pubkey_dtb.dts} | 0 ...car4_sa0.dts => 357_renesas_rcar4_sa0.dts} | 0 ...ize.dts => 358_renesas_rcar4_sa0_size.dts} | 0 .../{350_nxp_imx95.dts => 359_nxp_imx95.dts} | 0 ...ngine.dts => 360_fit_signature_engine.dts} | 0 ...s => 361_fit_signature_engine_encrypt.dts} | 0 ...ts => 362_fit_signature_engine_pkcs11.dts} | 0 ...63_fit_signature_engine_pkcs11_object.dts} | 0 14 files changed, 13 insertions(+), 13 deletions(-) rename tools/binman/test/{225_ti_dm.dts => 351_ti_dm.dts} (100%) rename tools/binman/test/{323_ti_board_cfg_phony.dts => 352_ti_board_cfg_phony.dts} (100%) rename tools/binman/test/{346_nxp_ddrfw_imx95.dts => 353_nxp_ddrfw_imx95.dts} (100%) rename tools/binman/test/{347_bl1.dts => 354_bl1.dts} (100%) rename tools/binman/test/{347_key_name_hint_dir_fit_signature.dts => 355_key_name_hint_dir_fit_signature.dts} (100%) rename tools/binman/test/{348_key_name_hint_dir_spl_pubkey_dtb.dts => 356_key_name_hint_dir_spl_pubkey_dtb.dts} (100%) rename tools/binman/test/{348_renesas_rcar4_sa0.dts => 357_renesas_rcar4_sa0.dts} (100%) rename tools/binman/test/{349_renesas_rcar4_sa0_size.dts => 358_renesas_rcar4_sa0_size.dts} (100%) rename tools/binman/test/{350_nxp_imx95.dts => 359_nxp_imx95.dts} (100%) rename tools/binman/test/{340_fit_signature_engine.dts => 360_fit_signature_engine.dts} (100%) rename tools/binman/test/{340_fit_signature_engine_encrypt.dts => 361_fit_signature_engine_encrypt.dts} (100%) rename tools/binman/test/{340_fit_signature_engine_pkcs11.dts => 362_fit_signature_engine_pkcs11.dts} (100%) rename tools/binman/test/{340_fit_signature_engine_pkcs11_object.dts => 363_fit_signature_engine_pkcs11_object.dts} (100%) diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index a53e37f31b3..208ac3896dd 100644 --- a/tools/binman/ftest.py +++ b/tools/binman/ftest.py @@ -5578,22 +5578,22 @@ fdt fdtmap Extract the devicetree blob from the fdtmap def testPackTiDm(self): """Test that an image with a TI DM binary can be created""" - data = self._DoReadFile('225_ti_dm.dts') + data = self._DoReadFile('351_ti_dm.dts') self.assertEqual(TI_DM_DATA, data[:len(TI_DM_DATA)]) def testPackBl1(self): """test if an image with a bl1 binary can be created""" - data = self._DoReadFile('347_bl1.dts') + data = self._DoReadFile('354_bl1.dts') self.assertEqual(ATF_BL1_DATA, data[:len(ATF_BL1_DATA)]) def testRenesasRCarGen4SA0Image(self): """Test that binman can produce an Renesas R-Car Gen4 SA0 image""" - self._DoTestFile('348_renesas_rcar4_sa0.dts') + self._DoTestFile('357_renesas_rcar4_sa0.dts') def testRenesasRCarGen4SA0ImageSize(self): """Test that binman can not produce large Renesas R-Car Gen4 SA0 image""" with self.assertRaises(ValueError) as exc: - self._DoTestFile('349_renesas_rcar4_sa0_size.dts') + self._DoTestFile('358_renesas_rcar4_sa0_size.dts') self.assertIn("Node '/binman/renesas-rcar4-sa0': SRAM data longer than 966656 Bytes", str(exc.exception)) @@ -7181,7 +7181,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap def testTIBoardConfigLint(self): """Test that an incorrectly linted config file would generate error""" with self.assertRaises(ValueError) as e: - data = self._DoReadFile('323_ti_board_cfg_phony.dts') + data = self._DoReadFile('352_ti_board_cfg_phony.dts') self.assertIn("Yamllint error", str(e.exception)) def testTIBoardConfigCombined(self): @@ -7324,7 +7324,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap def testKeyNameHintIsPathSplPubkeyDtb(self): """Test that binman errors out on key-name-hint being a path""" with self.assertRaises(ValueError) as e: - self._DoReadFile('348_key_name_hint_dir_spl_pubkey_dtb.dts') + self._DoReadFile('356_key_name_hint_dir_spl_pubkey_dtb.dts') self.assertIn( 'Node \'/binman/u-boot-spl-pubkey-dtb\': \'keys/key\' is a path not a filename', str(e.exception)) @@ -7901,7 +7901,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap def testNxpHeaderDdrfw(self): """Test that binman can add a header to DDR PHY firmware images""" - data = self._DoReadFile('346_nxp_ddrfw_imx95.dts') + data = self._DoReadFile('353_nxp_ddrfw_imx95.dts') self.assertEqual(len(IMX_LPDDR_IMEM_DATA).to_bytes(4, 'little') + len(IMX_LPDDR_DMEM_DATA).to_bytes(4, 'little') + IMX_LPDDR_IMEM_DATA + IMX_LPDDR_DMEM_DATA, data) @@ -7915,7 +7915,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap container_path = os.path.join(testdir, 'mx95b0-ahab-container.img') with open(container_path, 'w') as f: f.write(bytes([0x87]).decode('latin1') * 32768) - self._DoTestFile('350_nxp_imx95.dts', output_dir=testdir) + self._DoTestFile('359_nxp_imx95.dts', output_dir=testdir) def testFitSignSimple(self): """Test that image with FIT and signature nodes can be signed""" @@ -7973,7 +7973,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap with unittest.mock.patch.dict('os.environ', {'OPENSSL_ENGINES': ossl_engines_path}): data = self._DoReadFileDtb( - '340_fit_signature_engine.dts', + '360_fit_signature_engine.dts', entry_args=entry_args, extra_indirs=[test_subdir])[0] @@ -8014,7 +8014,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap with self.assertRaises(ValueError) as e: self._DoReadFileDtb( - '340_fit_signature_engine_encrypt.dts', + '361_fit_signature_engine_encrypt.dts', entry_args=entry_args, extra_indirs=[test_subdir]) @@ -8074,7 +8074,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap {'OPENSSL_CONF': ossl_conf, 'SOFTHSM2_CONF': softhsm2_conf}): data = self._DoReadFileDtb( - '340_fit_signature_engine_pkcs11.dts', + '362_fit_signature_engine_pkcs11.dts', entry_args=entry_args, extra_indirs=[test_subdir])[0] @@ -8152,7 +8152,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap 'SOFTHSM2_CONF': softhsm2_conf, 'MKIMAGE_SIGN_PIN': '1234'}): data = self._DoReadFileDtb( - '340_fit_signature_engine_pkcs11_object.dts', + '363_fit_signature_engine_pkcs11_object.dts', entry_args=entry_args, extra_indirs=[test_subdir])[0] @@ -8247,7 +8247,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap test_subdir = os.path.join(self._indir, TEST_FDT_SUBDIR) with self.assertRaises(ValueError) as e: self._DoReadFileDtb( - '347_key_name_hint_dir_fit_signature.dts', + '355_key_name_hint_dir_fit_signature.dts', entry_args=entry_args, extra_indirs=[test_subdir]) self.assertIn( diff --git a/tools/binman/test/225_ti_dm.dts b/tools/binman/test/351_ti_dm.dts similarity index 100% rename from tools/binman/test/225_ti_dm.dts rename to tools/binman/test/351_ti_dm.dts diff --git a/tools/binman/test/323_ti_board_cfg_phony.dts b/tools/binman/test/352_ti_board_cfg_phony.dts similarity index 100% rename from tools/binman/test/323_ti_board_cfg_phony.dts rename to tools/binman/test/352_ti_board_cfg_phony.dts diff --git a/tools/binman/test/346_nxp_ddrfw_imx95.dts b/tools/binman/test/353_nxp_ddrfw_imx95.dts similarity index 100% rename from tools/binman/test/346_nxp_ddrfw_imx95.dts rename to tools/binman/test/353_nxp_ddrfw_imx95.dts diff --git a/tools/binman/test/347_bl1.dts b/tools/binman/test/354_bl1.dts similarity index 100% rename from tools/binman/test/347_bl1.dts rename to tools/binman/test/354_bl1.dts diff --git a/tools/binman/test/347_key_name_hint_dir_fit_signature.dts b/tools/binman/test/355_key_name_hint_dir_fit_signature.dts similarity index 100% rename from tools/binman/test/347_key_name_hint_dir_fit_signature.dts rename to tools/binman/test/355_key_name_hint_dir_fit_signature.dts diff --git a/tools/binman/test/348_key_name_hint_dir_spl_pubkey_dtb.dts b/tools/binman/test/356_key_name_hint_dir_spl_pubkey_dtb.dts similarity index 100% rename from tools/binman/test/348_key_name_hint_dir_spl_pubkey_dtb.dts rename to tools/binman/test/356_key_name_hint_dir_spl_pubkey_dtb.dts diff --git a/tools/binman/test/348_renesas_rcar4_sa0.dts b/tools/binman/test/357_renesas_rcar4_sa0.dts similarity index 100% rename from tools/binman/test/348_renesas_rcar4_sa0.dts rename to tools/binman/test/357_renesas_rcar4_sa0.dts diff --git a/tools/binman/test/349_renesas_rcar4_sa0_size.dts b/tools/binman/test/358_renesas_rcar4_sa0_size.dts similarity index 100% rename from tools/binman/test/349_renesas_rcar4_sa0_size.dts rename to tools/binman/test/358_renesas_rcar4_sa0_size.dts diff --git a/tools/binman/test/350_nxp_imx95.dts b/tools/binman/test/359_nxp_imx95.dts similarity index 100% rename from tools/binman/test/350_nxp_imx95.dts rename to tools/binman/test/359_nxp_imx95.dts diff --git a/tools/binman/test/340_fit_signature_engine.dts b/tools/binman/test/360_fit_signature_engine.dts similarity index 100% rename from tools/binman/test/340_fit_signature_engine.dts rename to tools/binman/test/360_fit_signature_engine.dts diff --git a/tools/binman/test/340_fit_signature_engine_encrypt.dts b/tools/binman/test/361_fit_signature_engine_encrypt.dts similarity index 100% rename from tools/binman/test/340_fit_signature_engine_encrypt.dts rename to tools/binman/test/361_fit_signature_engine_encrypt.dts diff --git a/tools/binman/test/340_fit_signature_engine_pkcs11.dts b/tools/binman/test/362_fit_signature_engine_pkcs11.dts similarity index 100% rename from tools/binman/test/340_fit_signature_engine_pkcs11.dts rename to tools/binman/test/362_fit_signature_engine_pkcs11.dts diff --git a/tools/binman/test/340_fit_signature_engine_pkcs11_object.dts b/tools/binman/test/363_fit_signature_engine_pkcs11_object.dts similarity index 100% rename from tools/binman/test/340_fit_signature_engine_pkcs11_object.dts rename to tools/binman/test/363_fit_signature_engine_pkcs11_object.dts -- 2.43.0
