binman: test: Move x86 binary test data to test/x86/

Move descriptor.bin, fitimage.bin.gz and ifwi.bin.gz into the x86/
subdirectory alongside the x86 DTS test files and update all
references.

Signed-off-by: Simon Glass <simon.glass@canonical.com>

diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py
index 3f57ef05ead88b5b3d3ab1bcaf0dec9671ca37e8..601d1f7eb8c0a46c063fb255f4bcbf1c9dbacb08 100644 (file)
--- a/tools/binman/ftest.py
+++ b/tools/binman/ftest.py
@@ -696,7 +696,7 @@ class TestFunctional(unittest.TestCase):
 
     @classmethod
     def _SetupDescriptor(cls):
-        with open(cls.TestFile('descriptor.bin'), 'rb') as fd:
+        with open(cls.TestFile('x86/descriptor.bin'), 'rb') as fd:
             TestFunctional._MakeInputFile('descriptor.bin', fd.read())
 
     @classmethod
@@ -1237,7 +1237,7 @@ class TestFunctional(unittest.TestCase):
     def testPackX86RomMe(self):
         """Test that an x86 ROM with an ME region can be created"""
         data = self._DoReadFile('x86/rom_me.dts')
-        expected_desc = tools.read_file(self.TestFile('descriptor.bin'))
+        expected_desc = tools.read_file(self.TestFile('x86/descriptor.bin'))
         if data[:0x1000] != expected_desc:
             self.fail('Expected descriptor binary at start of image')
         self.assertEqual(ME_DATA, data[0x1000:0x1000 + len(ME_DATA)])
@@ -2530,7 +2530,7 @@ class TestFunctional(unittest.TestCase):
         self._SetupTplElf()
 
         # Intel Integrated Firmware Image (IFWI) file
-        with gzip.open(self.TestFile('%s.gz' % fname), 'rb') as fd:
+        with gzip.open(self.TestFile('x86/%s.gz' % fname), 'rb') as fd:
             data = fd.read()
         TestFunctional._MakeInputFile(fname,data)
 
@@ -2540,7 +2540,7 @@ class TestFunctional(unittest.TestCase):
         Args:
             data: Conents of output file
         """
-        expected_desc = tools.read_file(self.TestFile('descriptor.bin'))
+        expected_desc = tools.read_file(self.TestFile('x86/descriptor.bin'))
         if data[:0x1000] != expected_desc:
             self.fail('Expected descriptor binary at start of image')
 

diff --git a/tools/binman/test/descriptor.bin b/tools/binman/test/x86/descriptor.bin
similarity index 100%
rename from tools/binman/test/descriptor.bin
rename to tools/binman/test/x86/descriptor.bin

diff --git a/tools/binman/test/fitimage.bin.gz b/tools/binman/test/x86/fitimage.bin.gz
similarity index 100%
rename from tools/binman/test/fitimage.bin.gz
rename to tools/binman/test/x86/fitimage.bin.gz

diff --git a/tools/binman/test/ifwi.bin.gz b/tools/binman/test/x86/ifwi.bin.gz
similarity index 100%
rename from tools/binman/test/ifwi.bin.gz
rename to tools/binman/test/x86/ifwi.bin.gz