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>

diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py
index 0eb0667aac785ded82b8085f33d207a2853fde47..2e85a87e30b8d5dad62ca90682af2b650b61a764 100644 (file)
--- 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
deleted file mode 100644 (file)
index d5c69f9..0000000
--- a/tools/binman/test/029_x86-rom.dts
+++ /dev/null
@@ -1,19 +0,0 @@
-/dts-v1/;
-
-/ {
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       binman {
-               sort-by-offset;
-               end-at-4gb;
-               size = <32>;
-               u-boot {
-                       offset = <0xffffffe0>;
-               };
-
-               u-boot-spl {
-                       offset = <0xffffffeb>;
-               };
-       };
-};

diff --git a/tools/binman/test/029_x86_rom.dts b/tools/binman/test/029_x86_rom.dts
new file mode 100644 (file)
index 0000000..d5c69f9
--- /dev/null
+++ b/tools/binman/test/029_x86_rom.dts
@@ -0,0 +1,19 @@
+/dts-v1/;
+
+/ {
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       binman {
+               sort-by-offset;
+               end-at-4gb;
+               size = <32>;
+               u-boot {
+                       offset = <0xffffffe0>;
+               };
+
+               u-boot-spl {
+                       offset = <0xffffffeb>;
+               };
+       };
+};

diff --git a/tools/binman/test/030_x86-rom-me-no-desc.dts b/tools/binman/test/030_x86-rom-me-no-desc.dts
deleted file mode 100644 (file)
index 796cb87..0000000
--- a/tools/binman/test/030_x86-rom-me-no-desc.dts
+++ /dev/null
@@ -1,16 +0,0 @@
-/dts-v1/;
-
-/ {
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       binman {
-               sort-by-offset;
-               end-at-4gb;
-               size = <16>;
-               intel-me {
-                       filename = "me.bin";
-                       offset-unset;
-               };
-       };
-};

diff --git a/tools/binman/test/030_x86_rom_me_no_desc.dts b/tools/binman/test/030_x86_rom_me_no_desc.dts
new file mode 100644 (file)
index 0000000..796cb87
--- /dev/null
+++ b/tools/binman/test/030_x86_rom_me_no_desc.dts
@@ -0,0 +1,16 @@
+/dts-v1/;
+
+/ {
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       binman {
+               sort-by-offset;
+               end-at-4gb;
+               size = <16>;
+               intel-me {
+                       filename = "me.bin";
+                       offset-unset;
+               };
+       };
+};

diff --git a/tools/binman/test/031_x86-rom-me.dts b/tools/binman/test/031_x86-rom-me.dts
deleted file mode 100644 (file)
index b8b0a5a..0000000
--- a/tools/binman/test/031_x86-rom-me.dts
+++ /dev/null
@@ -1,20 +0,0 @@
-/dts-v1/;
-
-/ {
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       binman {
-               sort-by-offset;
-               end-at-4gb;
-               size = <0x800000>;
-               intel-descriptor {
-                       filename = "descriptor.bin";
-               };
-
-               intel-me {
-                       filename = "me.bin";
-                       offset-unset;
-               };
-       };
-};

diff --git a/tools/binman/test/031_x86_rom_me.dts b/tools/binman/test/031_x86_rom_me.dts
new file mode 100644 (file)
index 0000000..b8b0a5a
--- /dev/null
+++ b/tools/binman/test/031_x86_rom_me.dts
@@ -0,0 +1,20 @@
+/dts-v1/;
+
+/ {
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       binman {
+               sort-by-offset;
+               end-at-4gb;
+               size = <0x800000>;
+               intel-descriptor {
+                       filename = "descriptor.bin";
+               };
+
+               intel-me {
+                       filename = "me.bin";
+                       offset-unset;
+               };
+       };
+};

diff --git a/tools/binman/test/032_intel-vga.dts b/tools/binman/test/032_intel-vga.dts
deleted file mode 100644 (file)
index 9c532d0..0000000
--- a/tools/binman/test/032_intel-vga.dts
+++ /dev/null
@@ -1,14 +0,0 @@
-/dts-v1/;
-
-/ {
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       binman {
-               size = <16>;
-
-               intel-vga {
-                       filename = "vga.bin";
-               };
-       };
-};

diff --git a/tools/binman/test/032_intel_vga.dts b/tools/binman/test/032_intel_vga.dts
new file mode 100644 (file)
index 0000000..9c532d0
--- /dev/null
+++ b/tools/binman/test/032_intel_vga.dts
@@ -0,0 +1,14 @@
+/dts-v1/;
+
+/ {
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       binman {
+               size = <16>;
+
+               intel-vga {
+                       filename = "vga.bin";
+               };
+       };
+};

diff --git a/tools/binman/test/033_x86-start16.dts b/tools/binman/test/033_x86-start16.dts
deleted file mode 100644 (file)
index 2e279de..0000000
--- a/tools/binman/test/033_x86-start16.dts
+++ /dev/null
@@ -1,13 +0,0 @@
-/dts-v1/;
-
-/ {
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       binman {
-               size = <16>;
-
-               x86-start16 {
-               };
-       };
-};

diff --git a/tools/binman/test/033_x86_start16.dts b/tools/binman/test/033_x86_start16.dts
new file mode 100644 (file)
index 0000000..2e279de
--- /dev/null
+++ b/tools/binman/test/033_x86_start16.dts
@@ -0,0 +1,13 @@
+/dts-v1/;
+
+/ {
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       binman {
+               size = <16>;
+
+               x86-start16 {
+               };
+       };
+};

diff --git a/tools/binman/test/042_intel-fsp.dts b/tools/binman/test/042_intel-fsp.dts
deleted file mode 100644 (file)
index 8a7c889..0000000
--- a/tools/binman/test/042_intel-fsp.dts
+++ /dev/null
@@ -1,14 +0,0 @@
-/dts-v1/;
-
-/ {
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       binman {
-               size = <16>;
-
-               intel-fsp {
-                       filename = "fsp.bin";
-               };
-       };
-};

diff --git a/tools/binman/test/042_intel_fsp.dts b/tools/binman/test/042_intel_fsp.dts
new file mode 100644 (file)
index 0000000..8a7c889
--- /dev/null
+++ b/tools/binman/test/042_intel_fsp.dts
@@ -0,0 +1,14 @@
+/dts-v1/;
+
+/ {
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       binman {
+               size = <16>;
+
+               intel-fsp {
+                       filename = "fsp.bin";
+               };
+       };
+};

diff --git a/tools/binman/test/043_intel-cmc.dts b/tools/binman/test/043_intel-cmc.dts
deleted file mode 100644 (file)
index 5a56c7d..0000000
--- a/tools/binman/test/043_intel-cmc.dts
+++ /dev/null
@@ -1,14 +0,0 @@
-/dts-v1/;
-
-/ {
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       binman {
-               size = <16>;
-
-               intel-cmc {
-                       filename = "cmc.bin";
-               };
-       };
-};

diff --git a/tools/binman/test/043_intel_cmc.dts b/tools/binman/test/043_intel_cmc.dts
new file mode 100644 (file)
index 0000000..5a56c7d
--- /dev/null
+++ b/tools/binman/test/043_intel_cmc.dts
@@ -0,0 +1,14 @@
+/dts-v1/;
+
+/ {
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       binman {
+               size = <16>;
+
+               intel-cmc {
+                       filename = "cmc.bin";
+               };
+       };
+};

diff --git a/tools/binman/test/046_intel-vbt.dts b/tools/binman/test/046_intel-vbt.dts
deleted file mode 100644 (file)
index 733f575..0000000
--- a/tools/binman/test/046_intel-vbt.dts
+++ /dev/null
@@ -1,14 +0,0 @@
-/dts-v1/;
-
-/ {
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       binman {
-               size = <16>;
-
-               intel-vbt {
-                       filename = "vbt.bin";
-               };
-       };
-};

diff --git a/tools/binman/test/046_intel_vbt.dts b/tools/binman/test/046_intel_vbt.dts
new file mode 100644 (file)
index 0000000..733f575
--- /dev/null
+++ b/tools/binman/test/046_intel_vbt.dts
@@ -0,0 +1,14 @@
+/dts-v1/;
+
+/ {
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       binman {
+               size = <16>;
+
+               intel-vbt {
+                       filename = "vbt.bin";
+               };
+       };
+};

diff --git a/tools/binman/test/048_x86-start16-spl.dts b/tools/binman/test/048_x86-start16-spl.dts
deleted file mode 100644 (file)
index e2009f1..0000000
--- a/tools/binman/test/048_x86-start16-spl.dts
+++ /dev/null
@@ -1,13 +0,0 @@
-/dts-v1/;
-
-/ {
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       binman {
-               size = <16>;
-
-               x86-start16-spl {
-               };
-       };
-};

diff --git a/tools/binman/test/048_x86_start16_spl.dts b/tools/binman/test/048_x86_start16_spl.dts
new file mode 100644 (file)
index 0000000..e2009f1
--- /dev/null
+++ b/tools/binman/test/048_x86_start16_spl.dts
@@ -0,0 +1,13 @@
+/dts-v1/;
+
+/ {
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       binman {
+               size = <16>;
+
+               x86-start16-spl {
+               };
+       };
+};

diff --git a/tools/binman/test/081_x86-start16-tpl.dts b/tools/binman/test/081_x86-start16-tpl.dts
deleted file mode 100644 (file)
index 68e6bbd..0000000
--- a/tools/binman/test/081_x86-start16-tpl.dts
+++ /dev/null
@@ -1,14 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/dts-v1/;
-
-/ {
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       binman {
-               size = <16>;
-
-               x86-start16-tpl {
-               };
-       };
-};

diff --git a/tools/binman/test/081_x86_start16_tpl.dts b/tools/binman/test/081_x86_start16_tpl.dts
new file mode 100644 (file)
index 0000000..68e6bbd
--- /dev/null
+++ b/tools/binman/test/081_x86_start16_tpl.dts
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: GPL-2.0+
+/dts-v1/;
+
+/ {
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       binman {
+               size = <16>;
+
+               x86-start16-tpl {
+               };
+       };
+};

diff --git a/tools/binman/test/111_x86-rom-ifwi.dts b/tools/binman/test/111_x86-rom-ifwi.dts
deleted file mode 100644 (file)
index c0ba4f2..0000000
--- a/tools/binman/test/111_x86-rom-ifwi.dts
+++ /dev/null
@@ -1,29 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-
-/dts-v1/;
-
-/ {
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       binman {
-               sort-by-offset;
-               end-at-4gb;
-               size = <0x800000>;
-               intel-descriptor {
-                       filename = "descriptor.bin";
-               };
-
-               intel-ifwi {
-                       offset-unset;
-                       filename = "fitimage.bin";
-                       convert-fit;
-
-                       u-boot-tpl {
-                               ifwi-replace;
-                               ifwi-subpart = "IBBP";
-                               ifwi-entry = "IBBL";
-                       };
-               };
-       };
-};

diff --git a/tools/binman/test/111_x86_rom_ifwi.dts b/tools/binman/test/111_x86_rom_ifwi.dts
new file mode 100644 (file)
index 0000000..c0ba4f2
--- /dev/null
+++ b/tools/binman/test/111_x86_rom_ifwi.dts
@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+/dts-v1/;
+
+/ {
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       binman {
+               sort-by-offset;
+               end-at-4gb;
+               size = <0x800000>;
+               intel-descriptor {
+                       filename = "descriptor.bin";
+               };
+
+               intel-ifwi {
+                       offset-unset;
+                       filename = "fitimage.bin";
+                       convert-fit;
+
+                       u-boot-tpl {
+                               ifwi-replace;
+                               ifwi-subpart = "IBBP";
+                               ifwi-entry = "IBBL";
+                       };
+               };
+       };
+};

diff --git a/tools/binman/test/112_x86-rom-ifwi-nodesc.dts b/tools/binman/test/112_x86-rom-ifwi-nodesc.dts
deleted file mode 100644 (file)
index 0874440..0000000
--- a/tools/binman/test/112_x86-rom-ifwi-nodesc.dts
+++ /dev/null
@@ -1,28 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-
-/dts-v1/;
-
-/ {
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       binman {
-               sort-by-offset;
-               end-at-4gb;
-               size = <0x800000>;
-               intel-descriptor {
-                       filename = "descriptor.bin";
-               };
-
-               intel-ifwi {
-                       offset-unset;
-                       filename = "ifwi.bin";
-
-                       u-boot-tpl {
-                               ifwi-replace;
-                               ifwi-subpart = "IBBP";
-                               ifwi-entry = "IBBL";
-                       };
-               };
-       };
-};

diff --git a/tools/binman/test/112_x86_rom_ifwi_nodesc.dts b/tools/binman/test/112_x86_rom_ifwi_nodesc.dts
new file mode 100644 (file)
index 0000000..0874440
--- /dev/null
+++ b/tools/binman/test/112_x86_rom_ifwi_nodesc.dts
@@ -0,0 +1,28 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+/dts-v1/;
+
+/ {
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       binman {
+               sort-by-offset;
+               end-at-4gb;
+               size = <0x800000>;
+               intel-descriptor {
+                       filename = "descriptor.bin";
+               };
+
+               intel-ifwi {
+                       offset-unset;
+                       filename = "ifwi.bin";
+
+                       u-boot-tpl {
+                               ifwi-replace;
+                               ifwi-subpart = "IBBP";
+                               ifwi-entry = "IBBL";
+                       };
+               };
+       };
+};

diff --git a/tools/binman/test/113_x86-rom-ifwi-nodata.dts b/tools/binman/test/113_x86-rom-ifwi-nodata.dts
deleted file mode 100644 (file)
index 82a4bc8..0000000
--- a/tools/binman/test/113_x86-rom-ifwi-nodata.dts
+++ /dev/null
@@ -1,29 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-
-/dts-v1/;
-
-/ {
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       binman {
-               sort-by-offset;
-               end-at-4gb;
-               size = <0x800000>;
-               intel-descriptor {
-                       filename = "descriptor.bin";
-               };
-
-               intel-ifwi {
-                       offset-unset;
-                       filename = "ifwi.bin";
-
-                       _testing {
-                               return-unknown-contents;
-                               ifwi-replace;
-                               ifwi-subpart = "IBBP";
-                               ifwi-entry = "IBBL";
-                       };
-               };
-       };
-};

diff --git a/tools/binman/test/113_x86_rom_ifwi_nodata.dts b/tools/binman/test/113_x86_rom_ifwi_nodata.dts
new file mode 100644 (file)
index 0000000..82a4bc8
--- /dev/null
+++ b/tools/binman/test/113_x86_rom_ifwi_nodata.dts
@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+/dts-v1/;
+
+/ {
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       binman {
+               sort-by-offset;
+               end-at-4gb;
+               size = <0x800000>;
+               intel-descriptor {
+                       filename = "descriptor.bin";
+               };
+
+               intel-ifwi {
+                       offset-unset;
+                       filename = "ifwi.bin";
+
+                       _testing {
+                               return-unknown-contents;
+                               ifwi-replace;
+                               ifwi-subpart = "IBBP";
+                               ifwi-entry = "IBBL";
+                       };
+               };
+       };
+};