binman: Use the Makefile for u_boot_binman_syms_bad
authorSimon Glass <sjg@chromium.org>
Sat, 24 Aug 2019 13:22:58 +0000 (07:22 -0600)
committerSimon Glass <sjg@chromium.org>
Tue, 15 Oct 2019 14:40:02 +0000 (08:40 -0600)
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
tools/binman/test/Makefile
tools/binman/test/u_boot_binman_syms_bad [deleted file]

index a913970150a6104bbc81469cb416fd88ba898c24..1ee5d9d57c774c06a3e7df0c16cedab1440f3ccf 100644 (file)
@@ -72,7 +72,7 @@ def BuildElfTestFiles(target_dir):
               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_size')
+              'u_boot_binman_syms_size', 'u_boot_binman_syms_bad')
 
 
 class TestElf(unittest.TestCase):
@@ -134,7 +134,7 @@ class TestElf(unittest.TestCase):
         """
         entry = FakeEntry(10)
         section = FakeSection()
-        elf_fname = os.path.join(binman_dir, 'test', 'u_boot_binman_syms_bad')
+        elf_fname = self.ElfTestFile('u_boot_binman_syms_bad')
         self.assertEqual(elf.LookupAndWriteSymbols(elf_fname, entry, section),
                          None)
 
index 7af545979310269112a3c19c680de9a2b29b292e..593bbe9bd9d3482f8d7c321712dff2234b90ecd0 100644 (file)
@@ -13,7 +13,7 @@ CFLAGS := -march=i386 -m32 -nostdlib -I $(SRC)../../../include \
 
 LDS_UCODE := -T $(SRC)u_boot_ucode_ptr.lds
 LDS_BINMAN := -T $(SRC)u_boot_binman_syms.lds
-LDS_BINMAN_BAD := -T u_boot_binman_syms_bad.lds
+LDS_BINMAN_BAD := -T $(SRC)u_boot_binman_syms_bad.lds
 
 TARGETS = u_boot_ucode_ptr u_boot_no_ucode_ptr bss_data \
        u_boot_binman_syms u_boot_binman_syms.bin u_boot_binman_syms_bad \
diff --git a/tools/binman/test/u_boot_binman_syms_bad b/tools/binman/test/u_boot_binman_syms_bad
deleted file mode 100755 (executable)
index 8da3d9d..0000000
Binary files a/tools/binman/test/u_boot_binman_syms_bad and /dev/null differ