Message ID | 20190628140919.145948-18-sjg@chromium.org |
---|---|
State | Superseded |
Delegated to: | Simon Glass |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="DT2dlaWa"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45ZzHh0WCkz9s3Z for <incoming@patchwork.ozlabs.org>; Sat, 29 Jun 2019 00:12:47 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 0D3F2C21E2B; Fri, 28 Jun 2019 14:12:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 3A0C8C21DB5; Fri, 28 Jun 2019 14:10:06 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 3107FC21DB6; Fri, 28 Jun 2019 14:09:57 +0000 (UTC) Received: from mail-io1-f67.google.com (mail-io1-f67.google.com [209.85.166.67]) by lists.denx.de (Postfix) with ESMTPS id 99F4EC21DCA for <u-boot@lists.denx.de>; Fri, 28 Jun 2019 14:09:56 +0000 (UTC) Received: by mail-io1-f67.google.com with SMTP id h6so12830743ioh.3 for <u-boot@lists.denx.de>; Fri, 28 Jun 2019 07:09:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zAXM2QNT+SDDzS0RSLJuEfmK7ps/Qqd9PIFnvdJMMxs=; b=DT2dlaWaagESk3Iqh/Yt4KLTgvFGbkAetXVpnGaAZRAhyhOsQk3YX81GYaP45RK0Bw ntMsrAns/KaWpLXwXwsVtgaFQinZef64TeASjKovGAABdMhIOab2otNQbclgNnERaacQ iYtO/D2HJtgU3OQv7qgRjPa1ijWIOPY+BYPqo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zAXM2QNT+SDDzS0RSLJuEfmK7ps/Qqd9PIFnvdJMMxs=; b=UIjVu4f+uRVhbUhs9NtF3ZeFWqVgM9TAV/3c1NeiK0sHQBAswAhheNhobiikRnTA7Z zlBocSghPyg7D6pK7QMu8qL37QP1XG2ZfubC8R2mC2hKQuIN0UPduRp86qW4BKre1wE1 2GajR7JhVOWEcEjzqSBk1QeiBIjjNRCf3jcpJTUVer6rnt8JKKD0x1iCrwVzM9gwtfYg t5squoySR98tCzFz4RyWe9LeVm3RkC/GzLjlRmdX70KYWeAqOHh7Xnq6559R8xpE57nU Uyj+1v+HUrGdTzYxGZ8dGg13yWEA285n9bH0VHtE1XwHNJ12Dgbrvcu9tk/fB8VlaJ0d l22w== X-Gm-Message-State: APjAAAXh4x5CQX1CbIC5RiXXgIhxw2VG856GixrnhDJWKVnxayhmtvnM KghB1opaRYcZoMujGVwZLPvXfCic4tc= X-Google-Smtp-Source: APXvYqx7NbCbg+KLjbxV7sHVmM+XZWTY5O/KdE+XdKESXHnH7YBEqZvevYna5WHKODf4XlyFztS1ew== X-Received: by 2002:a02:3217:: with SMTP id j23mr12062113jaa.79.1561730995515; Fri, 28 Jun 2019 07:09:55 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id e26sm2839157iod.10.2019.06.28.07.09.55 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 28 Jun 2019 07:09:55 -0700 (PDT) From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Date: Fri, 28 Jun 2019 08:08:59 -0600 Message-Id: <20190628140919.145948-18-sjg@chromium.org> X-Mailer: git-send-email 2.22.0.410.gd8fdbe21b5-goog In-Reply-To: <20190628140919.145948-1-sjg@chromium.org> References: <20190628140919.145948-1-sjg@chromium.org> MIME-Version: 1.0 Subject: [U-Boot] [PATCH 17/37] binman: Ensure that coverage has access to site packages X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <http://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> |
Series |
binman: Add CBFS support
|
expand
|
diff --git a/tools/binman/binman.py b/tools/binman/binman.py index 9f8c5c99b79..05aeaecd8f3 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
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> --- tools/binman/binman.py | 8 ++++++++ 1 file changed, 8 insertions(+)