From: Simon Glass <[email protected]> Move about a dozen test files for U-Boot image variants (SPL, TPL, VPL, DTB, nodtb, bss-pad) into an xpl/ subdirectory. Drop the numeric prefixes and the redundant u_boot_ filename prefix, and update all references.
Signed-off-by: Simon Glass <[email protected]> --- tools/binman/ftest.py | 28 +++++++++---------- .../test/{036_u_boot_img.dts => xpl/img.dts} | 0 .../pack_dtb.dts} | 0 .../spl_bss_pad.dts} | 0 .../spl_dtb.dts} | 0 .../spl_expand.dts} | 0 .../spl_nodtb.dts} | 0 .../test/{078_u_boot_tpl.dts => xpl/tpl.dts} | 0 .../tpl_bss_pad.dts} | 0 .../tpl_nodtb.dts} | 0 .../test/{255_u_boot_vpl.dts => xpl/vpl.dts} | 0 .../vpl_bss_pad.dts} | 0 .../vpl_nodtb.dts} | 0 13 files changed, 14 insertions(+), 14 deletions(-) rename tools/binman/test/{036_u_boot_img.dts => xpl/img.dts} (100%) rename tools/binman/test/{026_pack_u_boot_dtb.dts => xpl/pack_dtb.dts} (100%) rename tools/binman/test/{047_spl_bss_pad.dts => xpl/spl_bss_pad.dts} (100%) rename tools/binman/test/{051_u_boot_spl_dtb.dts => xpl/spl_dtb.dts} (100%) rename tools/binman/test/{285_spl_expand.dts => xpl/spl_expand.dts} (100%) rename tools/binman/test/{052_u_boot_spl_nodtb.dts => xpl/spl_nodtb.dts} (100%) rename tools/binman/test/{078_u_boot_tpl.dts => xpl/tpl.dts} (100%) rename tools/binman/test/{193_tpl_bss_pad.dts => xpl/tpl_bss_pad.dts} (100%) rename tools/binman/test/{192_u_boot_tpl_nodtb.dts => xpl/tpl_nodtb.dts} (100%) rename tools/binman/test/{255_u_boot_vpl.dts => xpl/vpl.dts} (100%) rename tools/binman/test/{258_vpl_bss_pad.dts => xpl/vpl_bss_pad.dts} (100%) rename tools/binman/test/{256_u_boot_vpl_nodtb.dts => xpl/vpl_nodtb.dts} (100%) diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index 9cd4317aeed..da3f6952596 100644 --- a/tools/binman/ftest.py +++ b/tools/binman/ftest.py @@ -1178,7 +1178,7 @@ class TestFunctional(unittest.TestCase): def testPackUbootDtb(self): """Test that a device tree can be added to U-Boot""" - data = self._DoReadFile('026_pack_u_boot_dtb.dts') + data = self._DoReadFile('xpl/pack_dtb.dts') self.assertEqual(U_BOOT_NODTB_DATA + U_BOOT_DTB_DATA, data) def testPackX86RomNoSize(self): @@ -1362,7 +1362,7 @@ class TestFunctional(unittest.TestCase): def testUBootImg(self): """Test that u-boot.img can be put in a file""" - data = self._DoReadFile('036_u_boot_img.dts') + data = self._DoReadFile('xpl/img.dts') self.assertEqual(U_BOOT_IMG_DATA, data) def testNoMicrocode(self): @@ -1454,7 +1454,7 @@ class TestFunctional(unittest.TestCase): """Test that we can pad SPL's BSS with zeros""" # ELF file with a '__bss_size' symbol self._SetupSplElf() - data = self._DoReadFile('047_spl_bss_pad.dts') + data = self._DoReadFile('xpl/spl_bss_pad.dts') self.assertEqual(U_BOOT_SPL_DATA + tools.get_bytes(0, 10) + U_BOOT_DATA, data) @@ -1462,7 +1462,7 @@ class TestFunctional(unittest.TestCase): """Test that a missing symbol is detected""" self._SetupSplElf('u_boot_ucode_ptr') with self.assertRaises(ValueError) as e: - self._DoReadFile('047_spl_bss_pad.dts') + self._DoReadFile('xpl/spl_bss_pad.dts') self.assertIn('Expected __bss_size symbol in spl/u-boot-spl', str(e.exception)) @@ -1514,13 +1514,13 @@ class TestFunctional(unittest.TestCase): def testSplDtb(self): """Test that an image with spl/u-boot-spl.dtb can be created""" self._SetupSplElf() - data = self._DoReadFile('051_u_boot_spl_dtb.dts') + data = self._DoReadFile('xpl/spl_dtb.dts') self.assertEqual(U_BOOT_SPL_DTB_DATA, data[:len(U_BOOT_SPL_DTB_DATA)]) def testSplNoDtb(self): """Test that an image with spl/u-boot-spl-nodtb.bin can be created""" self._SetupSplElf() - data = self._DoReadFile('052_u_boot_spl_nodtb.dts') + data = self._DoReadFile('xpl/spl_nodtb.dts') self.assertEqual(U_BOOT_SPL_NODTB_DATA, data[:len(U_BOOT_SPL_NODTB_DATA)]) def checkSymbols(self, dts, base_data, u_boot_offset, entry_args=None, @@ -2031,7 +2031,7 @@ class TestFunctional(unittest.TestCase): """Test that an image with TPL and its device tree can be created""" # ELF file with a '__bss_size' symbol self._SetupTplElf() - data = self._DoReadFile('078_u_boot_tpl.dts') + data = self._DoReadFile('xpl/tpl.dts') self.assertEqual(U_BOOT_TPL_DATA + U_BOOT_TPL_DTB_DATA, data) def testUsesPos(self): @@ -4807,7 +4807,7 @@ class TestFunctional(unittest.TestCase): def testTplNoDtb(self): """Test that an image with tpl/u-boot-tpl-nodtb.bin can be created""" self._SetupTplElf() - data = self._DoReadFile('192_u_boot_tpl_nodtb.dts') + data = self._DoReadFile('xpl/tpl_nodtb.dts') self.assertEqual(U_BOOT_TPL_NODTB_DATA, data[:len(U_BOOT_TPL_NODTB_DATA)]) @@ -4815,7 +4815,7 @@ class TestFunctional(unittest.TestCase): """Test that we can pad TPL's BSS with zeros""" # ELF file with a '__bss_size' symbol self._SetupTplElf() - data = self._DoReadFile('193_tpl_bss_pad.dts') + data = self._DoReadFile('xpl/tpl_bss_pad.dts') self.assertEqual(U_BOOT_TPL_DATA + tools.get_bytes(0, 10) + U_BOOT_DATA, data) @@ -4823,7 +4823,7 @@ class TestFunctional(unittest.TestCase): """Test that a missing symbol is detected""" self._SetupTplElf('u_boot_ucode_ptr') with self.assertRaises(ValueError) as e: - self._DoReadFile('193_tpl_bss_pad.dts') + self._DoReadFile('xpl/tpl_bss_pad.dts') self.assertIn('Expected __bss_size symbol in tpl/u-boot-tpl', str(e.exception)) @@ -6336,13 +6336,13 @@ fdt fdtmap Extract the devicetree blob from the fdtmap """Test that an image with VPL and its device tree can be created""" # ELF file with a '__bss_size' symbol self._SetupVplElf() - data = self._DoReadFile('255_u_boot_vpl.dts') + data = self._DoReadFile('xpl/vpl.dts') self.assertEqual(U_BOOT_VPL_DATA + U_BOOT_VPL_DTB_DATA, data) def testVplNoDtb(self): """Test that an image with vpl/u-boot-vpl-nodtb.bin can be created""" self._SetupVplElf() - data = self._DoReadFile('256_u_boot_vpl_nodtb.dts') + data = self._DoReadFile('xpl/vpl_nodtb.dts') self.assertEqual(U_BOOT_VPL_NODTB_DATA, data[:len(U_BOOT_VPL_NODTB_DATA)]) @@ -6374,7 +6374,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap """Test that a missing symbol is detected""" self._SetupVplElf('u_boot_ucode_ptr') with self.assertRaises(ValueError) as e: - self._DoReadFile('258_vpl_bss_pad.dts') + self._DoReadFile('xpl/vpl_bss_pad.dts') self.assertIn('Expected __bss_size symbol in vpl/u-boot-vpl', str(e.exception)) @@ -7028,7 +7028,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap 'spl-bss-pad': 'y', 'spl-dtb': 'y', } - data = self._DoReadFileDtb('285_spl_expand.dts', + data = self._DoReadFileDtb('xpl/spl_expand.dts', use_expanded=True, entry_args=entry_args)[0] def testTemplate(self): diff --git a/tools/binman/test/036_u_boot_img.dts b/tools/binman/test/xpl/img.dts similarity index 100% rename from tools/binman/test/036_u_boot_img.dts rename to tools/binman/test/xpl/img.dts diff --git a/tools/binman/test/026_pack_u_boot_dtb.dts b/tools/binman/test/xpl/pack_dtb.dts similarity index 100% rename from tools/binman/test/026_pack_u_boot_dtb.dts rename to tools/binman/test/xpl/pack_dtb.dts diff --git a/tools/binman/test/047_spl_bss_pad.dts b/tools/binman/test/xpl/spl_bss_pad.dts similarity index 100% rename from tools/binman/test/047_spl_bss_pad.dts rename to tools/binman/test/xpl/spl_bss_pad.dts diff --git a/tools/binman/test/051_u_boot_spl_dtb.dts b/tools/binman/test/xpl/spl_dtb.dts similarity index 100% rename from tools/binman/test/051_u_boot_spl_dtb.dts rename to tools/binman/test/xpl/spl_dtb.dts diff --git a/tools/binman/test/285_spl_expand.dts b/tools/binman/test/xpl/spl_expand.dts similarity index 100% rename from tools/binman/test/285_spl_expand.dts rename to tools/binman/test/xpl/spl_expand.dts diff --git a/tools/binman/test/052_u_boot_spl_nodtb.dts b/tools/binman/test/xpl/spl_nodtb.dts similarity index 100% rename from tools/binman/test/052_u_boot_spl_nodtb.dts rename to tools/binman/test/xpl/spl_nodtb.dts diff --git a/tools/binman/test/078_u_boot_tpl.dts b/tools/binman/test/xpl/tpl.dts similarity index 100% rename from tools/binman/test/078_u_boot_tpl.dts rename to tools/binman/test/xpl/tpl.dts diff --git a/tools/binman/test/193_tpl_bss_pad.dts b/tools/binman/test/xpl/tpl_bss_pad.dts similarity index 100% rename from tools/binman/test/193_tpl_bss_pad.dts rename to tools/binman/test/xpl/tpl_bss_pad.dts diff --git a/tools/binman/test/192_u_boot_tpl_nodtb.dts b/tools/binman/test/xpl/tpl_nodtb.dts similarity index 100% rename from tools/binman/test/192_u_boot_tpl_nodtb.dts rename to tools/binman/test/xpl/tpl_nodtb.dts diff --git a/tools/binman/test/255_u_boot_vpl.dts b/tools/binman/test/xpl/vpl.dts similarity index 100% rename from tools/binman/test/255_u_boot_vpl.dts rename to tools/binman/test/xpl/vpl.dts diff --git a/tools/binman/test/258_vpl_bss_pad.dts b/tools/binman/test/xpl/vpl_bss_pad.dts similarity index 100% rename from tools/binman/test/258_vpl_bss_pad.dts rename to tools/binman/test/xpl/vpl_bss_pad.dts diff --git a/tools/binman/test/256_u_boot_vpl_nodtb.dts b/tools/binman/test/xpl/vpl_nodtb.dts similarity index 100% rename from tools/binman/test/256_u_boot_vpl_nodtb.dts rename to tools/binman/test/xpl/vpl_nodtb.dts -- 2.43.0
