binman: Use the Makefile for u_boot_binman_syms_size

Remove this file from git and instead build it using the Makefile. Signed-off-by: Simon Glass <[email protected]>
grygoriyS · Oct 15, 2019 · e9d2ee3 · e9d2ee3
1 parent 1542c8b
commit e9d2ee3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/tools/binman/elf_test.py b/tools/binman/elf_test.py
@@ -71,7 +71,8 @@ def BuildElfTestFiles(target_dir):
     tools.Run('make', '-C', target_dir, '-f',
               os.path.join(testdir, 'Makefile'), 'SRC=%s/' % testdir,
               'bss_data', 'u_boot_ucode_ptr', 'u_boot_no_ucode_ptr',
-              'u_boot_binman_syms', 'u_boot_binman_syms.bin')
+              'u_boot_binman_syms', 'u_boot_binman_syms.bin',
+              'u_boot_binman_syms_size')
 
 
 class TestElf(unittest.TestCase):
@@ -145,7 +146,7 @@ def testBadSymbolSize(self):
         """
         entry = FakeEntry(10)
         section = FakeSection()
-        elf_fname = os.path.join(binman_dir, 'test', 'u_boot_binman_syms_size')
+        elf_fname =self.ElfTestFile('u_boot_binman_syms_size')
         with self.assertRaises(ValueError) as e:
             syms = elf.LookupAndWriteSymbols(elf_fname, entry, section)
         self.assertIn('has size 1: only 4 and 8 are supported',

diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py
@@ -490,7 +490,7 @@ def _SetupSplElf(cls, src_fname='bss_data'):
         """
         # TODO([email protected]): Drop this when all Elf files use ElfTestFile()
         if src_fname in ['bss_data', 'u_boot_ucode_ptr', 'u_boot_no_ucode_ptr',
-                         'u_boot_binman_syms']:
+                         'u_boot_binman_syms', 'u_boot_binman_syms_size']:
             fname = cls.ElfTestFile(src_fname)
         else:
             fname = cls.TestFile(src_fname)

diff --git a/tools/binman/test/u_boot_binman_syms_size b/tools/binman/test/u_boot_binman_syms_size