From: Simon Glass <sjg@chromium.org>
Date: Mon, 8 Jul 2019 19:18:36 +0000 (-0600)
Subject: binman: Ensure that coverage has access to site packages
X-Git-Tag: v2019.10-rc1~14^2~61
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=86679cefe5fd3d24ccc4dc117c9e1b107f60c937;p=oweals%2Fu-boot.git

binman: Ensure that coverage has access to site packages

Code coverage tests fail on binman due to dist-packages being dropped from
the python path on Ubuntu 16.04. Add them in so that we can find the
elffile module, which is required by binman.

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

diff --git a/tools/binman/binman.py b/tools/binman/binman.py
index 9f8c5c99b7..05aeaecd8f 100755
--- a/tools/binman/binman.py
+++ b/tools/binman/binman.py
@@ -11,9 +11,11 @@
 
 from __future__ import print_function
 
+from distutils.sysconfig import get_python_lib
 import glob
 import multiprocessing
 import os
+import site
 import sys
 import traceback
 import unittest
@@ -28,6 +30,12 @@ sys.path.insert(0, 'scripts/dtc/pylibfdt')
 sys.path.insert(0, os.path.join(our_path,
                 '../../build-sandbox_spl/scripts/dtc/pylibfdt'))
 
+# When running under python-coverage on Ubuntu 16.04, the dist-packages
+# directories are dropped from the python path. Add them in so that we can find
+# the elffile module. We could use site.getsitepackages() here but unfortunately
+# that is not available in a virtualenv.
+sys.path.append(get_python_lib())
+
 import cmdline
 import command
 use_concurrent = True