From c28fbed34939ba7d39a04eecd40838439708e902 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Fri, 6 Mar 2026 11:12:45 -0700 Subject: 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 --- tools/binman/ftest.py | 8 ++++---- tools/binman/test/descriptor.bin | Bin 4096 -> 0 bytes tools/binman/test/fitimage.bin.gz | Bin 8418 -> 0 bytes tools/binman/test/ifwi.bin.gz | Bin 1884 -> 0 bytes tools/binman/test/x86/descriptor.bin | Bin 0 -> 4096 bytes tools/binman/test/x86/fitimage.bin.gz | Bin 0 -> 8418 bytes tools/binman/test/x86/ifwi.bin.gz | Bin 0 -> 1884 bytes 7 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 tools/binman/test/descriptor.bin delete mode 100644 tools/binman/test/fitimage.bin.gz delete mode 100644 tools/binman/test/ifwi.bin.gz create mode 100644 tools/binman/test/x86/descriptor.bin create mode 100644 tools/binman/test/x86/fitimage.bin.gz create mode 100644 tools/binman/test/x86/ifwi.bin.gz 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/descriptor.bin deleted file mode 100644 index 3d549436c27..00000000000 Binary files a/tools/binman/test/descriptor.bin and /dev/null differ diff --git a/tools/binman/test/fitimage.bin.gz b/tools/binman/test/fitimage.bin.gz deleted file mode 100644 index 0a9dcfc4248..00000000000 Binary files a/tools/binman/test/fitimage.bin.gz and /dev/null differ diff --git a/tools/binman/test/ifwi.bin.gz b/tools/binman/test/ifwi.bin.gz deleted file mode 100644 index 25d72892944..00000000000 Binary files a/tools/binman/test/ifwi.bin.gz and /dev/null differ diff --git a/tools/binman/test/x86/descriptor.bin b/tools/binman/test/x86/descriptor.bin new file mode 100644 index 00000000000..3d549436c27 Binary files /dev/null and b/tools/binman/test/x86/descriptor.bin differ diff --git a/tools/binman/test/x86/fitimage.bin.gz b/tools/binman/test/x86/fitimage.bin.gz new file mode 100644 index 00000000000..0a9dcfc4248 Binary files /dev/null and b/tools/binman/test/x86/fitimage.bin.gz differ diff --git a/tools/binman/test/x86/ifwi.bin.gz b/tools/binman/test/x86/ifwi.bin.gz new file mode 100644 index 00000000000..25d72892944 Binary files /dev/null and b/tools/binman/test/x86/ifwi.bin.gz differ -- cgit v1.2.3