[U-Boot] [PATCH 21/34] binman: Use underscore in test filenames
Simon Glass
sjg at chromium.org
Sat Aug 24 13:23:01 UTC 2019
At present a small number of test files use hyphens instead of
underscores. Rename them for consistency.
Signed-off-by: Simon Glass <sjg at chromium.org>
---
tools/binman/ftest.py | 28 +++++++++----------
.../test/{029_x86-rom.dts => 029_x86_rom.dts} | 0
...no-desc.dts => 030_x86_rom_me_no_desc.dts} | 0
...{031_x86-rom-me.dts => 031_x86_rom_me.dts} | 0
.../{032_intel-vga.dts => 032_intel_vga.dts} | 0
...33_x86-start16.dts => 033_x86_start16.dts} | 0
.../{042_intel-fsp.dts => 042_intel_fsp.dts} | 0
.../{043_intel-cmc.dts => 043_intel_cmc.dts} | 0
.../{046_intel-vbt.dts => 046_intel_vbt.dts} | 0
...tart16-spl.dts => 048_x86_start16_spl.dts} | 0
...tart16-tpl.dts => 081_x86_start16_tpl.dts} | 0
..._x86-rom-ifwi.dts => 111_x86_rom_ifwi.dts} | 0
...nodesc.dts => 112_x86_rom_ifwi_nodesc.dts} | 0
...nodata.dts => 113_x86_rom_ifwi_nodata.dts} | 0
14 files changed, 14 insertions(+), 14 deletions(-)
rename tools/binman/test/{029_x86-rom.dts => 029_x86_rom.dts} (100%)
rename tools/binman/test/{030_x86-rom-me-no-desc.dts => 030_x86_rom_me_no_desc.dts} (100%)
rename tools/binman/test/{031_x86-rom-me.dts => 031_x86_rom_me.dts} (100%)
rename tools/binman/test/{032_intel-vga.dts => 032_intel_vga.dts} (100%)
rename tools/binman/test/{033_x86-start16.dts => 033_x86_start16.dts} (100%)
rename tools/binman/test/{042_intel-fsp.dts => 042_intel_fsp.dts} (100%)
rename tools/binman/test/{043_intel-cmc.dts => 043_intel_cmc.dts} (100%)
rename tools/binman/test/{046_intel-vbt.dts => 046_intel_vbt.dts} (100%)
rename tools/binman/test/{048_x86-start16-spl.dts => 048_x86_start16_spl.dts} (100%)
rename tools/binman/test/{081_x86-start16-tpl.dts => 081_x86_start16_tpl.dts} (100%)
rename tools/binman/test/{111_x86-rom-ifwi.dts => 111_x86_rom_ifwi.dts} (100%)
rename tools/binman/test/{112_x86-rom-ifwi-nodesc.dts => 112_x86_rom_ifwi_nodesc.dts} (100%)
rename tools/binman/test/{113_x86-rom-ifwi-nodata.dts => 113_x86_rom_ifwi_nodata.dts} (100%)
diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py
index 008e747270..d0ec2f1f5c 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):
@@ -1595,7 +1595,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):
@@ -2067,20 +2067,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
similarity index 100%
rename from tools/binman/test/029_x86-rom.dts
rename to 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
similarity index 100%
rename from tools/binman/test/030_x86-rom-me-no-desc.dts
rename to 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
similarity index 100%
rename from tools/binman/test/031_x86-rom-me.dts
rename to 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
similarity index 100%
rename from tools/binman/test/032_intel-vga.dts
rename to 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
similarity index 100%
rename from tools/binman/test/033_x86-start16.dts
rename to 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
similarity index 100%
rename from tools/binman/test/042_intel-fsp.dts
rename to 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
similarity index 100%
rename from tools/binman/test/043_intel-cmc.dts
rename to 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
similarity index 100%
rename from tools/binman/test/046_intel-vbt.dts
rename to 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
similarity index 100%
rename from tools/binman/test/048_x86-start16-spl.dts
rename to 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
similarity index 100%
rename from tools/binman/test/081_x86-start16-tpl.dts
rename to 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
similarity index 100%
rename from tools/binman/test/111_x86-rom-ifwi.dts
rename to 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
similarity index 100%
rename from tools/binman/test/112_x86-rom-ifwi-nodesc.dts
rename to 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
similarity index 100%
rename from tools/binman/test/113_x86-rom-ifwi-nodata.dts
rename to tools/binman/test/113_x86_rom_ifwi_nodata.dts
--
2.23.0.187.g17f5b7556c-goog
More information about the U-Boot
mailing list