From 5cb0b256664327cbae305454b86afe0b4748b7e6 Mon Sep 17 00:00:00 2001 From: Stefan Herbrechtsmeier Date: Tue, 23 Aug 2022 12:46:09 +0200 Subject: [PATCH] binman: Sort tests and rework test-file numbers Tests should be in order of the test-file numbers. Sort the tests according to the test-file numbers and rework the test-file numbers to eliminate duplicate numbers. Signed-off-by: Stefan Herbrechtsmeier Reviewed-by: Simon Glass --- tools/binman/ftest.py | 113 +++++++++--------- .../binman/test/{225_dev.key => 230_dev.key} | 0 .../{225_pre_load.dts => 230_pre_load.dts} | 2 +- ...re_load_pkcs.dts => 231_pre_load_pkcs.dts} | 2 +- ..._pre_load_pss.dts => 232_pre_load_pss.dts} | 2 +- ...g.dts => 233_pre_load_invalid_padding.dts} | 2 +- ...d_sha.dts => 234_pre_load_invalid_sha.dts} | 2 +- ...algo.dts => 235_pre_load_invalid_algo.dts} | 2 +- ...d_key.dts => 236_pre_load_invalid_key.dts} | 2 +- ..._unique_names.dts => 237_unique_names.dts} | 0 ...s_multi.dts => 238_unique_names_multi.dts} | 0 ...ntool.dts => 239_replace_with_bintool.dts} | 0 ...eplace.dts => 240_fit_extract_replace.dts} | 0 ...ple.dts => 241_replace_section_simple.dts} | 0 ..._mkimage_name.dts => 242_mkimage_name.dts} | 0 ...kimage_image.dts => 243_mkimage_image.dts} | 0 ...t.dts => 244_mkimage_image_no_content.dts} | 0 ...mage_bad.dts => 245_mkimage_image_bad.dts} | 0 ...ion_other.dts => 246_collection_other.dts} | 0 ..._mkimage_coll.dts => 247_mkimage_coll.dts} | 0 ...s => 248_compress_dtb_prepend_invalid.dts} | 0 ...ts => 249_compress_dtb_prepend_length.dts} | 0 ...valid.dts => 250_compress_dtb_invalid.dts} | 0 ...dtb_zstd.dts => 251_compress_dtb_zstd.dts} | 0 24 files changed, 64 insertions(+), 63 deletions(-) rename tools/binman/test/{225_dev.key => 230_dev.key} (100%) rename tools/binman/test/{225_pre_load.dts => 230_pre_load.dts} (86%) rename tools/binman/test/{226_pre_load_pkcs.dts => 231_pre_load_pkcs.dts} (87%) rename tools/binman/test/{227_pre_load_pss.dts => 232_pre_load_pss.dts} (87%) rename tools/binman/test/{228_pre_load_invalid_padding.dts => 233_pre_load_invalid_padding.dts} (86%) rename tools/binman/test/{229_pre_load_invalid_sha.dts => 234_pre_load_invalid_sha.dts} (86%) rename tools/binman/test/{230_pre_load_invalid_algo.dts => 235_pre_load_invalid_algo.dts} (86%) rename tools/binman/test/{231_pre_load_invalid_key.dts => 236_pre_load_invalid_key.dts} (86%) rename tools/binman/test/{230_unique_names.dts => 237_unique_names.dts} (100%) rename tools/binman/test/{231_unique_names_multi.dts => 238_unique_names_multi.dts} (100%) rename tools/binman/test/{232_replace_with_bintool.dts => 239_replace_with_bintool.dts} (100%) rename tools/binman/test/{233_fit_extract_replace.dts => 240_fit_extract_replace.dts} (100%) rename tools/binman/test/{234_replace_section_simple.dts => 241_replace_section_simple.dts} (100%) rename tools/binman/test/{235_mkimage_name.dts => 242_mkimage_name.dts} (100%) rename tools/binman/test/{236_mkimage_image.dts => 243_mkimage_image.dts} (100%) rename tools/binman/test/{237_mkimage_image_no_content.dts => 244_mkimage_image_no_content.dts} (100%) rename tools/binman/test/{238_mkimage_image_bad.dts => 245_mkimage_image_bad.dts} (100%) rename tools/binman/test/{239_collection_other.dts => 246_collection_other.dts} (100%) rename tools/binman/test/{240_mkimage_coll.dts => 247_mkimage_coll.dts} (100%) rename tools/binman/test/{235_compress_dtb_prepend_invalid.dts => 248_compress_dtb_prepend_invalid.dts} (100%) rename tools/binman/test/{236_compress_dtb_prepend_length.dts => 249_compress_dtb_prepend_length.dts} (100%) rename tools/binman/test/{237_compress_dtb_invalid.dts => 250_compress_dtb_invalid.dts} (100%) rename tools/binman/test/{238_compress_dtb_zstd.dts => 251_compress_dtb_zstd.dts} (100%) diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index 0b1774046f..5422940e07 100644 --- a/tools/binman/ftest.py +++ b/tools/binman/ftest.py @@ -5351,16 +5351,6 @@ fdt fdtmap Extract the devicetree blob from the fdtmap "Node '/binman/u-boot': Please use 'extend-size' instead of 'expand-size'", str(e.exception)) - def testMkimageMissingBlob(self): - """Test using mkimage to build an image""" - with test_util.capture_sys_output() as (stdout, stderr): - self._DoTestFile('229_mkimage_missing.dts', allow_missing=True, - allow_fake_blobs=True) - err = stderr.getvalue() - self.assertRegex( - err, - "Image '.*' has faked external blobs and is non-functional: .*") - def testFitSplitElf(self): """Test an image with an FIT with an split-elf operation""" if not elf.ELF_TOOLS: @@ -5461,24 +5451,6 @@ fdt fdtmap Extract the devicetree blob from the fdtmap "Node '/binman/fit': subnode 'images/@atf-SEQ': Failed to read ELF file: Magic number does not match", str(exc.exception)) - def testFitSplitElfBadDirective(self): - """Test a FIT split-elf invalid fit,xxx directive in an image node""" - if not elf.ELF_TOOLS: - self.skipTest('Python elftools not available') - err = self._check_bad_fit('227_fit_bad_dir.dts') - self.assertIn( - "Node '/binman/fit': subnode 'images/@atf-SEQ': Unknown directive 'fit,something'", - err) - - def testFitSplitElfBadDirectiveConfig(self): - """Test a FIT split-elf with invalid fit,xxx directive in config""" - if not elf.ELF_TOOLS: - self.skipTest('Python elftools not available') - err = self._check_bad_fit('228_fit_bad_dir_config.dts') - self.assertEqual( - "Node '/binman/fit': subnode 'configurations/@config-SEQ': Unknown directive 'fit,config'", - err) - def checkFitSplitElf(self, **kwargs): """Test an split-elf FIT with a missing ELF file @@ -5505,6 +5477,25 @@ fdt fdtmap Extract the devicetree blob from the fdtmap err = stderr.getvalue() return out, err + def testFitSplitElfBadDirective(self): + """Test a FIT split-elf invalid fit,xxx directive in an image node""" + if not elf.ELF_TOOLS: + self.skipTest('Python elftools not available') + err = self._check_bad_fit('227_fit_bad_dir.dts') + self.assertIn( + "Node '/binman/fit': subnode 'images/@atf-SEQ': Unknown directive 'fit,something'", + err) + + def testFitSplitElfBadDirectiveConfig(self): + """Test a FIT split-elf with invalid fit,xxx directive in config""" + if not elf.ELF_TOOLS: + self.skipTest('Python elftools not available') + err = self._check_bad_fit('228_fit_bad_dir_config.dts') + self.assertEqual( + "Node '/binman/fit': subnode 'configurations/@config-SEQ': Unknown directive 'fit,config'", + err) + + def testFitSplitElfMissing(self): """Test an split-elf FIT with a missing ELF file""" if not elf.ELF_TOOLS: @@ -5531,31 +5522,41 @@ fdt fdtmap Extract the devicetree blob from the fdtmap fname = tools.get_output_filename('binman-fake/missing.elf') self.assertTrue(os.path.exists(fname)) + def testMkimageMissingBlob(self): + """Test using mkimage to build an image""" + with test_util.capture_sys_output() as (stdout, stderr): + self._DoTestFile('229_mkimage_missing.dts', allow_missing=True, + allow_fake_blobs=True) + err = stderr.getvalue() + self.assertRegex( + err, + "Image '.*' has faked external blobs and is non-functional: .*") + def testPreLoad(self): """Test an image with a pre-load header""" entry_args = { 'pre-load-key-path': '.', } - data, _, _, _ = self._DoReadFileDtb('225_pre_load.dts', + data, _, _, _ = self._DoReadFileDtb('230_pre_load.dts', entry_args=entry_args) self.assertEqual(PRE_LOAD_MAGIC, data[:len(PRE_LOAD_MAGIC)]) self.assertEqual(PRE_LOAD_VERSION, data[4:4 + len(PRE_LOAD_VERSION)]) self.assertEqual(PRE_LOAD_HDR_SIZE, data[8:8 + len(PRE_LOAD_HDR_SIZE)]) - data = self._DoReadFile('225_pre_load.dts') + data = self._DoReadFile('230_pre_load.dts') self.assertEqual(PRE_LOAD_MAGIC, data[:len(PRE_LOAD_MAGIC)]) self.assertEqual(PRE_LOAD_VERSION, data[4:4 + len(PRE_LOAD_VERSION)]) self.assertEqual(PRE_LOAD_HDR_SIZE, data[8:8 + len(PRE_LOAD_HDR_SIZE)]) def testPreLoadPkcs(self): """Test an image with a pre-load header with padding pkcs""" - data = self._DoReadFile('226_pre_load_pkcs.dts') + data = self._DoReadFile('231_pre_load_pkcs.dts') self.assertEqual(PRE_LOAD_MAGIC, data[:len(PRE_LOAD_MAGIC)]) self.assertEqual(PRE_LOAD_VERSION, data[4:4 + len(PRE_LOAD_VERSION)]) self.assertEqual(PRE_LOAD_HDR_SIZE, data[8:8 + len(PRE_LOAD_HDR_SIZE)]) def testPreLoadPss(self): """Test an image with a pre-load header with padding pss""" - data = self._DoReadFile('227_pre_load_pss.dts') + data = self._DoReadFile('232_pre_load_pss.dts') self.assertEqual(PRE_LOAD_MAGIC, data[:len(PRE_LOAD_MAGIC)]) self.assertEqual(PRE_LOAD_VERSION, data[4:4 + len(PRE_LOAD_VERSION)]) self.assertEqual(PRE_LOAD_HDR_SIZE, data[8:8 + len(PRE_LOAD_HDR_SIZE)]) @@ -5563,22 +5564,22 @@ fdt fdtmap Extract the devicetree blob from the fdtmap def testPreLoadInvalidPadding(self): """Test an image with a pre-load header with an invalid padding""" with self.assertRaises(ValueError) as e: - data = self._DoReadFile('228_pre_load_invalid_padding.dts') + data = self._DoReadFile('233_pre_load_invalid_padding.dts') def testPreLoadInvalidSha(self): """Test an image with a pre-load header with an invalid hash""" with self.assertRaises(ValueError) as e: - data = self._DoReadFile('229_pre_load_invalid_sha.dts') + data = self._DoReadFile('234_pre_load_invalid_sha.dts') def testPreLoadInvalidAlgo(self): """Test an image with a pre-load header with an invalid algo""" with self.assertRaises(ValueError) as e: - data = self._DoReadFile('230_pre_load_invalid_algo.dts') + data = self._DoReadFile('235_pre_load_invalid_algo.dts') def testPreLoadInvalidKey(self): """Test an image with a pre-load header with an invalid key""" with self.assertRaises(ValueError) as e: - data = self._DoReadFile('231_pre_load_invalid_key.dts') + data = self._DoReadFile('236_pre_load_invalid_key.dts') def _CheckSafeUniqueNames(self, *images): """Check all entries of given images for unsafe unique names""" @@ -5593,7 +5594,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap def testSafeUniqueNames(self): """Test entry unique names are safe in single image configuration""" - data = self._DoReadFileRealDtb('230_unique_names.dts') + data = self._DoReadFileRealDtb('237_unique_names.dts') orig_image = control.images['image'] image_fname = tools.get_output_filename('image.bin') @@ -5603,7 +5604,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap def testSafeUniqueNamesMulti(self): """Test entry unique names are safe with multiple images""" - data = self._DoReadFileRealDtb('231_unique_names_multi.dts') + data = self._DoReadFileRealDtb('238_unique_names_multi.dts') orig_image = control.images['image'] image_fname = tools.get_output_filename('image.bin') @@ -5613,7 +5614,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap def testReplaceCmdWithBintool(self): """Test replacing an entry that needs a bintool to pack""" - data = self._DoReadFileRealDtb('232_replace_with_bintool.dts') + data = self._DoReadFileRealDtb('239_replace_with_bintool.dts') expected = U_BOOT_DATA + b'aa' self.assertEqual(expected, data[:len(expected)]) @@ -5632,7 +5633,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap def testReplaceCmdOtherWithBintool(self): """Test replacing an entry when another needs a bintool to pack""" - data = self._DoReadFileRealDtb('232_replace_with_bintool.dts') + data = self._DoReadFileRealDtb('239_replace_with_bintool.dts') expected = U_BOOT_DATA + b'aa' self.assertEqual(expected, data[:len(expected)]) @@ -5672,7 +5673,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap def testExtractFit(self): """Test extracting a FIT section""" - self._DoReadFileRealDtb('233_fit_extract_replace.dts') + self._DoReadFileRealDtb('240_fit_extract_replace.dts') image_fname = tools.get_output_filename('image.bin') fit_data = control.ReadEntry(image_fname, 'fit') @@ -5691,7 +5692,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap def testExtractFitSubentries(self): """Test extracting FIT section subentries""" - self._DoReadFileRealDtb('233_fit_extract_replace.dts') + self._DoReadFileRealDtb('240_fit_extract_replace.dts') image_fname = tools.get_output_filename('image.bin') for entry_path, expected in [ @@ -5710,7 +5711,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap new_data = b'x' * len(U_BOOT_DATA) data, expected_fdtmap, _ = self._RunReplaceCmd( 'fit/kernel/u-boot', new_data, - dts='233_fit_extract_replace.dts') + dts='240_fit_extract_replace.dts') self.assertEqual(new_data, data) path, fdtmap = state.GetFdtContents('fdtmap') @@ -5722,7 +5723,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap new_data = b'ub' * len(U_BOOT_NODTB_DATA) data, expected_fdtmap, _ = self._RunReplaceCmd( 'fit/fdt-1/u-boot-nodtb', new_data, - dts='233_fit_extract_replace.dts') + dts='240_fit_extract_replace.dts') self.assertEqual(new_data, data) # Will be repacked, so fdtmap must change @@ -5736,7 +5737,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap expected = new_data.ljust(len(U_BOOT_NODTB_DATA), b'\0') data, expected_fdtmap, _ = self._RunReplaceCmd( 'fit/fdt-1/u-boot-nodtb', new_data, - dts='233_fit_extract_replace.dts') + dts='240_fit_extract_replace.dts') self.assertEqual(expected, data) path, fdtmap = state.GetFdtContents('fdtmap') @@ -5748,14 +5749,14 @@ fdt fdtmap Extract the devicetree blob from the fdtmap new_data = b'w' * len(COMPRESS_DATA + U_BOOT_DATA) with self.assertRaises(ValueError) as exc: self._RunReplaceCmd('section', new_data, - dts='234_replace_section_simple.dts') + dts='241_replace_section_simple.dts') self.assertIn( "Node '/section': Replacing sections is not implemented yet", str(exc.exception)) def testMkimageImagename(self): """Test using mkimage with -n holding the data too""" - data = self._DoReadFile('235_mkimage_name.dts') + data = self._DoReadFile('242_mkimage_name.dts') # Check that the data appears in the file somewhere self.assertIn(U_BOOT_SPL_DATA, data) @@ -5772,7 +5773,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap def testMkimageImage(self): """Test using mkimage with -n holding the data too""" - data = self._DoReadFile('236_mkimage_image.dts') + data = self._DoReadFile('243_mkimage_image.dts') # Check that the data appears in the file somewhere self.assertIn(U_BOOT_SPL_DATA, data) @@ -5793,20 +5794,20 @@ fdt fdtmap Extract the devicetree blob from the fdtmap def testMkimageImageNoContent(self): """Test using mkimage with -n and no data""" with self.assertRaises(ValueError) as exc: - self._DoReadFile('237_mkimage_image_no_content.dts') + self._DoReadFile('244_mkimage_image_no_content.dts') self.assertIn('Could not complete processing of contents', str(exc.exception)) def testMkimageImageBad(self): """Test using mkimage with imagename node and data-to-imagename""" with self.assertRaises(ValueError) as exc: - self._DoReadFile('238_mkimage_image_bad.dts') + self._DoReadFile('245_mkimage_image_bad.dts') self.assertIn('Cannot use both imagename node and data-to-imagename', str(exc.exception)) def testCollectionOther(self): """Test a collection where the data comes from another section""" - data = self._DoReadFile('239_collection_other.dts') + data = self._DoReadFile('246_collection_other.dts') self.assertEqual(U_BOOT_NODTB_DATA + U_BOOT_DTB_DATA + tools.get_bytes(0xff, 2) + U_BOOT_NODTB_DATA + tools.get_bytes(0xfe, 3) + U_BOOT_DTB_DATA, @@ -5814,20 +5815,20 @@ fdt fdtmap Extract the devicetree blob from the fdtmap def testMkimageCollection(self): """Test using a collection referring to an entry in a mkimage entry""" - data = self._DoReadFile('240_mkimage_coll.dts') + data = self._DoReadFile('247_mkimage_coll.dts') expect = U_BOOT_SPL_DATA + U_BOOT_DATA self.assertEqual(expect, data[:len(expect)]) def testCompressDtbPrependInvalid(self): """Test that invalid header is detected""" with self.assertRaises(ValueError) as e: - self._DoReadFileDtb('235_compress_dtb_prepend_invalid.dts') + self._DoReadFileDtb('248_compress_dtb_prepend_invalid.dts') self.assertIn("Node '/binman/u-boot-dtb': Invalid prepend in " "'u-boot-dtb': 'invalid'", str(e.exception)) def testCompressDtbPrependLength(self): """Test that compress with length header works as expected""" - data = self._DoReadFileRealDtb('236_compress_dtb_prepend_length.dts') + data = self._DoReadFileRealDtb('249_compress_dtb_prepend_length.dts') image = control.images['image'] entries = image.GetEntries() self.assertIn('u-boot-dtb', entries) @@ -5860,7 +5861,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap def testInvalidCompress(self): """Test that invalid compress algorithm is detected""" with self.assertRaises(ValueError) as e: - self._DoTestFile('237_compress_dtb_invalid.dts') + self._DoTestFile('250_compress_dtb_invalid.dts') self.assertIn("Unknown algorithm 'invalid'", str(e.exception)) def testCompUtilCompressions(self): @@ -5893,7 +5894,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap def testCompressDtbZstd(self): """Test that zstd compress of device-tree files failed""" with self.assertRaises(ValueError) as e: - self._DoTestFile('238_compress_dtb_zstd.dts') + self._DoTestFile('251_compress_dtb_zstd.dts') self.assertIn("Node '/binman/u-boot-dtb': The zstd compression " "requires a length header", str(e.exception)) diff --git a/tools/binman/test/225_dev.key b/tools/binman/test/230_dev.key similarity index 100% rename from tools/binman/test/225_dev.key rename to tools/binman/test/230_dev.key diff --git a/tools/binman/test/225_pre_load.dts b/tools/binman/test/230_pre_load.dts similarity index 86% rename from tools/binman/test/225_pre_load.dts rename to tools/binman/test/230_pre_load.dts index c1ffe1a2ff..c0c24729f8 100644 --- a/tools/binman/test/225_pre_load.dts +++ b/tools/binman/test/230_pre_load.dts @@ -10,7 +10,7 @@ pre-load { content = <&image>; algo-name = "sha256,rsa2048"; - key-name = "tools/binman/test/225_dev.key"; + key-name = "tools/binman/test/230_dev.key"; header-size = <4096>; version = <0x11223344>; }; diff --git a/tools/binman/test/226_pre_load_pkcs.dts b/tools/binman/test/231_pre_load_pkcs.dts similarity index 87% rename from tools/binman/test/226_pre_load_pkcs.dts rename to tools/binman/test/231_pre_load_pkcs.dts index 3db0a37f77..530638c56b 100644 --- a/tools/binman/test/226_pre_load_pkcs.dts +++ b/tools/binman/test/231_pre_load_pkcs.dts @@ -11,7 +11,7 @@ content = <&image>; algo-name = "sha256,rsa2048"; padding-name = "pkcs-1.5"; - key-name = "tools/binman/test/225_dev.key"; + key-name = "tools/binman/test/230_dev.key"; header-size = <4096>; version = <0x11223344>; }; diff --git a/tools/binman/test/227_pre_load_pss.dts b/tools/binman/test/232_pre_load_pss.dts similarity index 87% rename from tools/binman/test/227_pre_load_pss.dts rename to tools/binman/test/232_pre_load_pss.dts index b1b01d5ad5..371e0fdb40 100644 --- a/tools/binman/test/227_pre_load_pss.dts +++ b/tools/binman/test/232_pre_load_pss.dts @@ -11,7 +11,7 @@ content = <&image>; algo-name = "sha256,rsa2048"; padding-name = "pss"; - key-name = "tools/binman/test/225_dev.key"; + key-name = "tools/binman/test/230_dev.key"; header-size = <4096>; version = <0x11223344>; }; diff --git a/tools/binman/test/228_pre_load_invalid_padding.dts b/tools/binman/test/233_pre_load_invalid_padding.dts similarity index 86% rename from tools/binman/test/228_pre_load_invalid_padding.dts rename to tools/binman/test/233_pre_load_invalid_padding.dts index 84fe289183..9cb4cb570b 100644 --- a/tools/binman/test/228_pre_load_invalid_padding.dts +++ b/tools/binman/test/233_pre_load_invalid_padding.dts @@ -11,7 +11,7 @@ content = <&image>; algo-name = "sha256,rsa2048"; padding-name = "padding"; - key-name = "tools/binman/test/225_dev.key"; + key-name = "tools/binman/test/230_dev.key"; header-size = <4096>; version = <1>; }; diff --git a/tools/binman/test/229_pre_load_invalid_sha.dts b/tools/binman/test/234_pre_load_invalid_sha.dts similarity index 86% rename from tools/binman/test/229_pre_load_invalid_sha.dts rename to tools/binman/test/234_pre_load_invalid_sha.dts index a2b6725c89..8ded98df53 100644 --- a/tools/binman/test/229_pre_load_invalid_sha.dts +++ b/tools/binman/test/234_pre_load_invalid_sha.dts @@ -11,7 +11,7 @@ content = <&image>; algo-name = "sha2560,rsa2048"; padding-name = "pkcs-1.5"; - key-name = "tools/binman/test/225_dev.key"; + key-name = "tools/binman/test/230_dev.key"; header-size = <4096>; version = <1>; }; diff --git a/tools/binman/test/230_pre_load_invalid_algo.dts b/tools/binman/test/235_pre_load_invalid_algo.dts similarity index 86% rename from tools/binman/test/230_pre_load_invalid_algo.dts rename to tools/binman/test/235_pre_load_invalid_algo.dts index 34c8d34f15..145286caa3 100644 --- a/tools/binman/test/230_pre_load_invalid_algo.dts +++ b/tools/binman/test/235_pre_load_invalid_algo.dts @@ -11,7 +11,7 @@ content = <&image>; algo-name = "sha256,rsa20480"; padding-name = "pkcs-1.5"; - key-name = "tools/binman/test/225_dev.key"; + key-name = "tools/binman/test/230_dev.key"; header-size = <4096>; version = <1>; }; diff --git a/tools/binman/test/231_pre_load_invalid_key.dts b/tools/binman/test/236_pre_load_invalid_key.dts similarity index 86% rename from tools/binman/test/231_pre_load_invalid_key.dts rename to tools/binman/test/236_pre_load_invalid_key.dts index 08d5a75ddf..df858c3a28 100644 --- a/tools/binman/test/231_pre_load_invalid_key.dts +++ b/tools/binman/test/236_pre_load_invalid_key.dts @@ -11,7 +11,7 @@ content = <&image>; algo-name = "sha256,rsa4096"; padding-name = "pkcs-1.5"; - key-name = "tools/binman/test/225_dev.key"; + key-name = "tools/binman/test/230_dev.key"; header-size = <4096>; version = <1>; }; diff --git a/tools/binman/test/230_unique_names.dts b/tools/binman/test/237_unique_names.dts similarity index 100% rename from tools/binman/test/230_unique_names.dts rename to tools/binman/test/237_unique_names.dts diff --git a/tools/binman/test/231_unique_names_multi.dts b/tools/binman/test/238_unique_names_multi.dts similarity index 100% rename from tools/binman/test/231_unique_names_multi.dts rename to tools/binman/test/238_unique_names_multi.dts diff --git a/tools/binman/test/232_replace_with_bintool.dts b/tools/binman/test/239_replace_with_bintool.dts similarity index 100% rename from tools/binman/test/232_replace_with_bintool.dts rename to tools/binman/test/239_replace_with_bintool.dts diff --git a/tools/binman/test/233_fit_extract_replace.dts b/tools/binman/test/240_fit_extract_replace.dts similarity index 100% rename from tools/binman/test/233_fit_extract_replace.dts rename to tools/binman/test/240_fit_extract_replace.dts diff --git a/tools/binman/test/234_replace_section_simple.dts b/tools/binman/test/241_replace_section_simple.dts similarity index 100% rename from tools/binman/test/234_replace_section_simple.dts rename to tools/binman/test/241_replace_section_simple.dts diff --git a/tools/binman/test/235_mkimage_name.dts b/tools/binman/test/242_mkimage_name.dts similarity index 100% rename from tools/binman/test/235_mkimage_name.dts rename to tools/binman/test/242_mkimage_name.dts diff --git a/tools/binman/test/236_mkimage_image.dts b/tools/binman/test/243_mkimage_image.dts similarity index 100% rename from tools/binman/test/236_mkimage_image.dts rename to tools/binman/test/243_mkimage_image.dts diff --git a/tools/binman/test/237_mkimage_image_no_content.dts b/tools/binman/test/244_mkimage_image_no_content.dts similarity index 100% rename from tools/binman/test/237_mkimage_image_no_content.dts rename to tools/binman/test/244_mkimage_image_no_content.dts diff --git a/tools/binman/test/238_mkimage_image_bad.dts b/tools/binman/test/245_mkimage_image_bad.dts similarity index 100% rename from tools/binman/test/238_mkimage_image_bad.dts rename to tools/binman/test/245_mkimage_image_bad.dts diff --git a/tools/binman/test/239_collection_other.dts b/tools/binman/test/246_collection_other.dts similarity index 100% rename from tools/binman/test/239_collection_other.dts rename to tools/binman/test/246_collection_other.dts diff --git a/tools/binman/test/240_mkimage_coll.dts b/tools/binman/test/247_mkimage_coll.dts similarity index 100% rename from tools/binman/test/240_mkimage_coll.dts rename to tools/binman/test/247_mkimage_coll.dts diff --git a/tools/binman/test/235_compress_dtb_prepend_invalid.dts b/tools/binman/test/248_compress_dtb_prepend_invalid.dts similarity index 100% rename from tools/binman/test/235_compress_dtb_prepend_invalid.dts rename to tools/binman/test/248_compress_dtb_prepend_invalid.dts diff --git a/tools/binman/test/236_compress_dtb_prepend_length.dts b/tools/binman/test/249_compress_dtb_prepend_length.dts similarity index 100% rename from tools/binman/test/236_compress_dtb_prepend_length.dts rename to tools/binman/test/249_compress_dtb_prepend_length.dts diff --git a/tools/binman/test/237_compress_dtb_invalid.dts b/tools/binman/test/250_compress_dtb_invalid.dts similarity index 100% rename from tools/binman/test/237_compress_dtb_invalid.dts rename to tools/binman/test/250_compress_dtb_invalid.dts diff --git a/tools/binman/test/238_compress_dtb_zstd.dts b/tools/binman/test/251_compress_dtb_zstd.dts similarity index 100% rename from tools/binman/test/238_compress_dtb_zstd.dts rename to tools/binman/test/251_compress_dtb_zstd.dts -- 2.39.5