[U-Boot,17/34] binman: Use the Makefile for u_boot_binman_syms_size
diff mbox series

Message ID 20190824132315.53130-18-sjg@chromium.org
State Accepted
Delegated to: Simon Glass
Headers show
Series
  • binman: Various improvements and tidy-ups
Related show

Commit Message

Simon Glass Aug. 24, 2019, 1:22 p.m. UTC
Remove this file from git and instead build it using the Makefile.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

 tools/binman/elf_test.py                  |   5 +++--
 tools/binman/ftest.py                     |   2 +-
 tools/binman/test/u_boot_binman_syms_size | Bin 4825 -> 0 bytes
 3 files changed, 4 insertions(+), 3 deletions(-)
 delete mode 100755 tools/binman/test/u_boot_binman_syms_size

diff --git a/tools/binman/test/u_boot_binman_syms_size b/tools/binman/test/u_boot_binman_syms_size
deleted file mode 100755
index d691e897c0f1842cb82efbc67f57d9f62853b99c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4825
zcmeHLyKWOv5FI~+mChk_G%jq(2>Hq;D?t(oMY4z$2|-f0i*)7nuFOi_hrD+Sryze|
zet;iH2NGo(I=XcH0Tm7Tf^f#WV{DlQ>O0c$+?hEuyZ6|Q=jzq#lTxWfVr8n3L=KW4
z>v_eY1}bf;Q8lj@d9Jn!Jm3KNYT?<jH4AW_asI=2a9hUxYh$<SHenU83RnfK0#*U5
zfK|XMU=^?mSOu&CRspNP|0%%##~%R|VDM&0-<k*N_Gt0-!_Cj{&TR2{@8Z`r4f_4V
zMtkUHk;xj4dZC=ovuqjl-uE2Ub=3ZoJWr(3d1yv1yqV?xot&cB_-Ybm%FTkQ*9kmQ
zZV-i|NTWxCJoQP9<1q9i^Dnn~3~~)9OB0p|O*zB!9oZDXyA8f8*PGzUt^?tUcZ@UV
zy8v4Yyr=nb`N=iLF2J+I&cHjB0A6OZU%ea7U(omop7$LLem}I*4zNDYdq|WaCnobG
z{+pNWjoiPo@noJajJ&%_clYaaIA%S$Kfhy{p05$=$i76(J0G?>=D&rP=W*<A#F&z4
zH;#?|^JS+x4K95(Cdn0yG@0sT7AHE1Q_`s!%?xSb@Q=igyv>Agf^anP^*B!EMcZ%C
C$!_BS

Comments

Simon Glass Sept. 27, 2019, 12:38 a.m. UTC | #1
Remove this file from git and instead build it using the Makefile.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

 tools/binman/elf_test.py                  |   5 +++--
 tools/binman/ftest.py                     |   2 +-
 tools/binman/test/u_boot_binman_syms_size | Bin 4825 -> 0 bytes
 3 files changed, 4 insertions(+), 3 deletions(-)
 delete mode 100755 tools/binman/test/u_boot_binman_syms_size

Applied to u-boot-dm, thanks!

Patch
diff mbox series

diff --git a/tools/binman/elf_test.py b/tools/binman/elf_test.py
index ff036cb655..a913970150 100644
--- 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 @@  class TestElf(unittest.TestCase):
         """
         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
index 507c481881..51eab6fbfa 100644
--- a/tools/binman/ftest.py
+++ b/tools/binman/ftest.py
@@ -490,7 +490,7 @@  class TestFunctional(unittest.TestCase):
         """
         # TODO(sjg@chromium.org): 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)