diff options
| author | Simon Glass <sjg@chromium.org> | 2019-05-17 22:00:51 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2019-07-10 16:52:58 -0600 |
| commit | eb546ac181ba93a16949167a4a41a38fe539b378 (patch) | |
| tree | d998f583abd17806d2c9c93d9ed9c0d14610ce28 /tools/binman | |
| parent | 1fc62de19fff9ab5228af72038753ec3a529eef1 (diff) | |
binman: Read map files as text
These files are text files so should be read as such, so that
string-equality assertions work as expected.
With this binman tests work correctly on Python 2 and Python 3:
PYTHONPATH=/tmp/b/sandbox_spl/scripts/dtc/pylibfdt \
python ./tools/binman/binman -t
Change first line of binman.py to end "python3":
PYTHONPATH=~/cosarm/dtc/pylibfdt:tools/patman \
python3 ./tools/binman/binman -t
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'tools/binman')
| -rw-r--r-- | tools/binman/ftest.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index d0a8b751a2..cc57ef3e04 100644 --- a/tools/binman/ftest.py +++ b/tools/binman/ftest.py @@ -1777,7 +1777,7 @@ class TestFunctional(unittest.TestCase): # We should not get an inmage, but there should be a map file self.assertFalse(os.path.exists(tools.GetOutputFilename('image.bin'))) self.assertTrue(os.path.exists(map_fname)) - map_data = tools.ReadFile(map_fname) + map_data = tools.ReadFile(map_fname, binary=False) self.assertEqual('''ImagePos Offset Size Name <none> 00000000 00000007 main-section <none> 00000000 00000004 u-boot |