diff options
author | Simon Glass <sjg@chromium.org> | 2019-08-24 07:23:01 -0600 |
---|---|---|
committer | Simon Glass <sjg@chromium.org> | 2019-10-15 08:40:02 -0600 |
commit | 9255f3c58ef509ea8d6480edcb0bd332b99ee63a (patch) | |
tree | e1c1e621468b24e121f2aa4fd9994c1b9a1d5b8b /tools/binman | |
parent | 2090f1e3d096bd124790e1716240e17e56325755 (diff) | |
download | u-boot-9255f3c58ef509ea8d6480edcb0bd332b99ee63a.zip u-boot-9255f3c58ef509ea8d6480edcb0bd332b99ee63a.tar.gz u-boot-9255f3c58ef509ea8d6480edcb0bd332b99ee63a.tar.bz2 |
binman: Use underscore in test filenames
At present a small number of test files use hyphens instead of
underscores. Rename them for consistency.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'tools/binman')
-rw-r--r-- | tools/binman/ftest.py | 28 | ||||
-rw-r--r-- | tools/binman/test/029_x86_rom.dts (renamed from tools/binman/test/029_x86-rom.dts) | 0 | ||||
-rw-r--r-- | tools/binman/test/030_x86_rom_me_no_desc.dts (renamed from tools/binman/test/030_x86-rom-me-no-desc.dts) | 0 | ||||
-rw-r--r-- | tools/binman/test/031_x86_rom_me.dts (renamed from tools/binman/test/031_x86-rom-me.dts) | 0 | ||||
-rw-r--r-- | tools/binman/test/032_intel_vga.dts (renamed from tools/binman/test/032_intel-vga.dts) | 0 | ||||
-rw-r--r-- | tools/binman/test/033_x86_start16.dts (renamed from tools/binman/test/033_x86-start16.dts) | 0 | ||||
-rw-r--r-- | tools/binman/test/042_intel_fsp.dts (renamed from tools/binman/test/042_intel-fsp.dts) | 0 | ||||
-rw-r--r-- | tools/binman/test/043_intel_cmc.dts (renamed from tools/binman/test/043_intel-cmc.dts) | 0 | ||||
-rw-r--r-- | tools/binman/test/046_intel_vbt.dts (renamed from tools/binman/test/046_intel-vbt.dts) | 0 | ||||
-rw-r--r-- | tools/binman/test/048_x86_start16_spl.dts (renamed from tools/binman/test/048_x86-start16-spl.dts) | 0 | ||||
-rw-r--r-- | tools/binman/test/081_x86_start16_tpl.dts (renamed from tools/binman/test/081_x86-start16-tpl.dts) | 0 | ||||
-rw-r--r-- | tools/binman/test/111_x86_rom_ifwi.dts (renamed from tools/binman/test/111_x86-rom-ifwi.dts) | 0 | ||||
-rw-r--r-- | tools/binman/test/112_x86_rom_ifwi_nodesc.dts (renamed from tools/binman/test/112_x86-rom-ifwi-nodesc.dts) | 0 | ||||
-rw-r--r-- | tools/binman/test/113_x86_rom_ifwi_nodata.dts (renamed from tools/binman/test/113_x86-rom-ifwi-nodata.dts) | 0 |
14 files changed, 14 insertions, 14 deletions
diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index 0eb0667..2e85a87 100644 --- a/tools/binman/ftest.py +++ b/tools/binman/ftest.py @@ -921,7 +921,7 @@ class TestFunctional(unittest.TestCase): def testPackX86Rom(self): """Test that a basic x86 ROM can be created""" self._SetupSplElf() - data = self._DoReadFile('029_x86-rom.dts') + data = self._DoReadFile('029_x86_rom.dts') self.assertEqual(U_BOOT_DATA + tools.GetBytes(0, 7) + U_BOOT_SPL_DATA + tools.GetBytes(0, 2), data) @@ -929,21 +929,21 @@ class TestFunctional(unittest.TestCase): """Test that an invalid Intel descriptor entry is detected""" TestFunctional._MakeInputFile('descriptor.bin', b'') with self.assertRaises(ValueError) as e: - self._DoTestFile('031_x86-rom-me.dts') + self._DoTestFile('031_x86_rom_me.dts') self.assertIn("Node '/binman/intel-descriptor': Cannot find Intel Flash Descriptor (FD) signature", str(e.exception)) def testPackX86RomBadDesc(self): """Test that the Intel requires a descriptor entry""" with self.assertRaises(ValueError) as e: - self._DoTestFile('030_x86-rom-me-no-desc.dts') + self._DoTestFile('030_x86_rom_me_no_desc.dts') self.assertIn("Node '/binman/intel-me': No offset set with " "offset-unset: should another entry provide this correct " "offset?", str(e.exception)) def testPackX86RomMe(self): """Test that an x86 ROM with an ME region can be created""" - data = self._DoReadFile('031_x86-rom-me.dts') + data = self._DoReadFile('031_x86_rom_me.dts') expected_desc = tools.ReadFile(self.TestFile('descriptor.bin')) if data[:0x1000] != expected_desc: self.fail('Expected descriptor binary at start of image') @@ -951,12 +951,12 @@ class TestFunctional(unittest.TestCase): def testPackVga(self): """Test that an image with a VGA binary can be created""" - data = self._DoReadFile('032_intel-vga.dts') + data = self._DoReadFile('032_intel_vga.dts') self.assertEqual(VGA_DATA, data[:len(VGA_DATA)]) def testPackStart16(self): """Test that an image with an x86 start16 region can be created""" - data = self._DoReadFile('033_x86-start16.dts') + data = self._DoReadFile('033_x86_start16.dts') self.assertEqual(X86_START16_DATA, data[:len(X86_START16_DATA)]) def testPackPowerpcMpc85xxBootpgResetvec(self): @@ -1144,17 +1144,17 @@ class TestFunctional(unittest.TestCase): def testPackFsp(self): """Test that an image with a FSP binary can be created""" - data = self._DoReadFile('042_intel-fsp.dts') + data = self._DoReadFile('042_intel_fsp.dts') self.assertEqual(FSP_DATA, data[:len(FSP_DATA)]) def testPackCmc(self): """Test that an image with a CMC binary can be created""" - data = self._DoReadFile('043_intel-cmc.dts') + data = self._DoReadFile('043_intel_cmc.dts') self.assertEqual(CMC_DATA, data[:len(CMC_DATA)]) def testPackVbt(self): """Test that an image with a VBT binary can be created""" - data = self._DoReadFile('046_intel-vbt.dts') + data = self._DoReadFile('046_intel_vbt.dts') self.assertEqual(VBT_DATA, data[:len(VBT_DATA)]) def testSplBssPad(self): @@ -1175,7 +1175,7 @@ class TestFunctional(unittest.TestCase): def testPackStart16Spl(self): """Test that an image with an x86 start16 SPL region can be created""" - data = self._DoReadFile('048_x86-start16-spl.dts') + data = self._DoReadFile('048_x86_start16_spl.dts') self.assertEqual(X86_START16_SPL_DATA, data[:len(X86_START16_SPL_DATA)]) def _PackUbootSplMicrocode(self, dts, ucode_second=False): @@ -1594,7 +1594,7 @@ class TestFunctional(unittest.TestCase): def testPackStart16Tpl(self): """Test that an image with an x86 start16 TPL region can be created""" - data = self._DoReadFile('081_x86-start16-tpl.dts') + data = self._DoReadFile('081_x86_start16_tpl.dts') self.assertEqual(X86_START16_TPL_DATA, data[:len(X86_START16_TPL_DATA)]) def testSelectImage(self): @@ -2065,20 +2065,20 @@ class TestFunctional(unittest.TestCase): def testPackX86RomIfwi(self): """Test that an x86 ROM with Integrated Firmware Image can be created""" self._SetupIfwi('fitimage.bin') - data = self._DoReadFile('111_x86-rom-ifwi.dts') + data = self._DoReadFile('111_x86_rom_ifwi.dts') self._CheckIfwi(data) def testPackX86RomIfwiNoDesc(self): """Test that an x86 ROM with IFWI can be created from an ifwi.bin file""" self._SetupIfwi('ifwi.bin') - data = self._DoReadFile('112_x86-rom-ifwi-nodesc.dts') + data = self._DoReadFile('112_x86_rom_ifwi_nodesc.dts') self._CheckIfwi(data) def testPackX86RomIfwiNoData(self): """Test that an x86 ROM with IFWI handles missing data""" self._SetupIfwi('ifwi.bin') with self.assertRaises(ValueError) as e: - data = self._DoReadFile('113_x86-rom-ifwi-nodata.dts') + data = self._DoReadFile('113_x86_rom_ifwi_nodata.dts') self.assertIn('Could not complete processing of contents', str(e.exception)) diff --git a/tools/binman/test/029_x86-rom.dts b/tools/binman/test/029_x86_rom.dts index d5c69f9..d5c69f9 100644 --- a/tools/binman/test/029_x86-rom.dts +++ b/tools/binman/test/029_x86_rom.dts diff --git a/tools/binman/test/030_x86-rom-me-no-desc.dts b/tools/binman/test/030_x86_rom_me_no_desc.dts index 796cb87..796cb87 100644 --- a/tools/binman/test/030_x86-rom-me-no-desc.dts +++ b/tools/binman/test/030_x86_rom_me_no_desc.dts diff --git a/tools/binman/test/031_x86-rom-me.dts b/tools/binman/test/031_x86_rom_me.dts index b8b0a5a..b8b0a5a 100644 --- a/tools/binman/test/031_x86-rom-me.dts +++ b/tools/binman/test/031_x86_rom_me.dts diff --git a/tools/binman/test/032_intel-vga.dts b/tools/binman/test/032_intel_vga.dts index 9c532d0..9c532d0 100644 --- a/tools/binman/test/032_intel-vga.dts +++ b/tools/binman/test/032_intel_vga.dts diff --git a/tools/binman/test/033_x86-start16.dts b/tools/binman/test/033_x86_start16.dts index 2e279de..2e279de 100644 --- a/tools/binman/test/033_x86-start16.dts +++ b/tools/binman/test/033_x86_start16.dts diff --git a/tools/binman/test/042_intel-fsp.dts b/tools/binman/test/042_intel_fsp.dts index 8a7c889..8a7c889 100644 --- a/tools/binman/test/042_intel-fsp.dts +++ b/tools/binman/test/042_intel_fsp.dts diff --git a/tools/binman/test/043_intel-cmc.dts b/tools/binman/test/043_intel_cmc.dts index 5a56c7d..5a56c7d 100644 --- a/tools/binman/test/043_intel-cmc.dts +++ b/tools/binman/test/043_intel_cmc.dts diff --git a/tools/binman/test/046_intel-vbt.dts b/tools/binman/test/046_intel_vbt.dts index 733f575..733f575 100644 --- a/tools/binman/test/046_intel-vbt.dts +++ b/tools/binman/test/046_intel_vbt.dts diff --git a/tools/binman/test/048_x86-start16-spl.dts b/tools/binman/test/048_x86_start16_spl.dts index e2009f1..e2009f1 100644 --- a/tools/binman/test/048_x86-start16-spl.dts +++ b/tools/binman/test/048_x86_start16_spl.dts diff --git a/tools/binman/test/081_x86-start16-tpl.dts b/tools/binman/test/081_x86_start16_tpl.dts index 68e6bbd..68e6bbd 100644 --- a/tools/binman/test/081_x86-start16-tpl.dts +++ b/tools/binman/test/081_x86_start16_tpl.dts diff --git a/tools/binman/test/111_x86-rom-ifwi.dts b/tools/binman/test/111_x86_rom_ifwi.dts index c0ba4f2..c0ba4f2 100644 --- a/tools/binman/test/111_x86-rom-ifwi.dts +++ b/tools/binman/test/111_x86_rom_ifwi.dts diff --git a/tools/binman/test/112_x86-rom-ifwi-nodesc.dts b/tools/binman/test/112_x86_rom_ifwi_nodesc.dts index 0874440..0874440 100644 --- a/tools/binman/test/112_x86-rom-ifwi-nodesc.dts +++ b/tools/binman/test/112_x86_rom_ifwi_nodesc.dts diff --git a/tools/binman/test/113_x86-rom-ifwi-nodata.dts b/tools/binman/test/113_x86_rom_ifwi_nodata.dts index 82a4bc8..82a4bc8 100644 --- a/tools/binman/test/113_x86-rom-ifwi-nodata.dts +++ b/tools/binman/test/113_x86_rom_ifwi_nodata.dts |