[PATCH 2/4] binman: Renumber 277_rockchip and 278_mkimage test files

Simon Glass sjg at chromium.org
Mon Jul 24 17:19:58 CEST 2023


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

Signed-off-by: Simon Glass <sjg at chromium.org>
---

 tools/binman/ftest.py                                       | 6 +++---
 .../test/{277_rockchip_tpl.dts => 291_rockchip_tpl.dts}     | 0
 ...issing_multiple.dts => 292_mkimage_missing_multiple.dts} | 0
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename tools/binman/test/{277_rockchip_tpl.dts => 291_rockchip_tpl.dts} (100%)
 rename tools/binman/test/{278_mkimage_missing_multiple.dts => 292_mkimage_missing_multiple.dts} (100%)

diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py
index 376af9fa0806..40d2fd5da1b6 100644
--- a/tools/binman/ftest.py
+++ b/tools/binman/ftest.py
@@ -6683,18 +6683,18 @@ fdt         fdtmap                Extract the devicetree blob from the fdtmap
 
     def testPackRockchipTpl(self):
         """Test that an image with a Rockchip TPL binary can be created"""
-        data = self._DoReadFile('277_rockchip_tpl.dts')
+        data = self._DoReadFile('291_rockchip_tpl.dts')
         self.assertEqual(ROCKCHIP_TPL_DATA, data[:len(ROCKCHIP_TPL_DATA)])
 
     def testMkimageMissingBlobMultiple(self):
         """Test missing blob with mkimage entry and multiple-data-files"""
         with test_util.capture_sys_output() as (stdout, stderr):
-            self._DoTestFile('278_mkimage_missing_multiple.dts', allow_missing=True)
+            self._DoTestFile('292_mkimage_missing_multiple.dts', allow_missing=True)
         err = stderr.getvalue()
         self.assertIn("is missing external blobs and is non-functional", err)
 
         with self.assertRaises(ValueError) as e:
-            self._DoTestFile('278_mkimage_missing_multiple.dts', allow_missing=False)
+            self._DoTestFile('292_mkimage_missing_multiple.dts', allow_missing=False)
         self.assertIn("not found in input path", str(e.exception))
 
     def _PrepareSignEnv(self, dts='280_fit_sign.dts'):
diff --git a/tools/binman/test/277_rockchip_tpl.dts b/tools/binman/test/291_rockchip_tpl.dts
similarity index 100%
rename from tools/binman/test/277_rockchip_tpl.dts
rename to tools/binman/test/291_rockchip_tpl.dts
diff --git a/tools/binman/test/278_mkimage_missing_multiple.dts b/tools/binman/test/292_mkimage_missing_multiple.dts
similarity index 100%
rename from tools/binman/test/278_mkimage_missing_multiple.dts
rename to tools/binman/test/292_mkimage_missing_multiple.dts
-- 
2.41.0.487.g6d72f3e995-goog



More information about the U-Boot mailing list