commit 510ef0f4bd7006fa258d25006e1c194b6d948300
author Simon Glass <sjg@chromium.org> Mon Oct 26 17:40:13 2020 -0600
committer Simon Glass <sjg@chromium.org> Thu Oct 29 14:42:59 2020 -0600
tree f5e1df52b70b40a5b99c055a72579fe12db0cd75
parent ff1903a7a2cc2b0f1c554efe311e54d957d4a7b5

binman: Move section padding to the parent

Each section is padded up to its size, if the contents are not large
enough. Move this logic from _BuildSectionData() to
GetPaddedDataForEntry() so that all the padding is in one place.

With this, the testDual test is working again, so enable it.

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

tools/binman/ftest.py

diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py
index 82be997..31e93c6 100644
--- a/tools/binman/ftest.py
+++ b/tools/binman/ftest.py
@@ -708,7 +708,6 @@
         """Test a simple binman run with debugging enabled"""
         self._DoTestFile('005_simple.dts', debug=True)
 
-    @unittest.skip('Disable for now until padding of images is supported')
     def testDual(self):
         """Test that we can handle creating two images
 
@@ -3872,9 +3871,7 @@
         before = tools.GetBytes(0, 8)
         after = tools.GetBytes(0, 4)
         all = before + U_BOOT_DATA + after
-
-        # This is not correct, but it is what binman currently produces
-        self.assertEqual(before + U_BOOT_DATA + tools.GetBytes(0, 16), data)
+        self.assertEqual(all, data)
 
         image = control.images['image']
         entries = image.GetEntries()
@@ -3882,6 +3879,7 @@
         self.assertEqual(0, section.offset)
         self.assertEqual(len(all), section.size)
         self.assertIsNone(section.data)
+        self.assertEqual(all, section.GetPaddedData())
 
         entry = section.GetEntries()['u-boot']
         self.assertEqual(16, entry.offset)