From: Simon Glass <[email protected]> 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 <[email protected]> --- Changes in v2: - Add new patch to move x86 binary test data tools/binman/ftest.py | 8 ++++---- tools/binman/test/{ => x86}/descriptor.bin | Bin tools/binman/test/{ => x86}/fitimage.bin.gz | Bin tools/binman/test/{ => x86}/ifwi.bin.gz | Bin 4 files changed, 4 insertions(+), 4 deletions(-) rename tools/binman/test/{ => x86}/descriptor.bin (100%) rename tools/binman/test/{ => x86}/fitimage.bin.gz (100%) rename tools/binman/test/{ => x86}/ifwi.bin.gz (100%) diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index 3f57ef05ead..601d1f7eb8c 100644 --- 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 -- 2.43.0
