From patchwork Thu Jun 20 13:19:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1950153 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=gOSKJvFG; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4W4h1c0rwRz20Wb for ; Thu, 20 Jun 2024 23:20:20 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 90CDC884F9; Thu, 20 Jun 2024 15:19:57 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="gOSKJvFG"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A0C3C88532; Thu, 20 Jun 2024 15:19:54 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x12c.google.com (mail-il1-x12c.google.com [IPv6:2607:f8b0:4864:20::12c]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 92E468846F for ; Thu, 20 Jun 2024 15:19:52 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12c.google.com with SMTP id e9e14a558f8ab-3762abfe005so1337755ab.2 for ; Thu, 20 Jun 2024 06:19:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1718889591; x=1719494391; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=y33pMt5dN4bzyeC10EVwpfzP4S/ME5jzzKoDBLaDsqQ=; b=gOSKJvFGNPKB2jxXL5AnaNfdl6IGmUi3BmsRsqIJVQhB8pcgvBeapKBOrrG8qZLJzi 5kDcDXsMsEafey9j9YQFkkKCuTXecYGKAxyDx5RKu+LZUApsCAOfEY/ml2bxigyT+73+ pMlnYx/Up4iN2GBiMtOm0bqYzY7sCm95fIdTw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718889591; x=1719494391; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=y33pMt5dN4bzyeC10EVwpfzP4S/ME5jzzKoDBLaDsqQ=; b=QDqUAuxTOYh2gYHqm3jcqyy8dxbuqswy1V+24futV3gcVRwMc6+9dzVrCYIaoASFLH GQivktNakaNI3TcXUYv4H3iKVQqNyGpTtPV1khvUxUwPRu3aR4tX0a2X8M5tY8g930xA uou+WIXBNr5fFQMj3LCHopEpYFS06CW08djvj4DoKdetGFzEOlMslOW/eObm4TdoJB+9 KkI1ogzOgM0EtMj5DnjEtbh2vl6yTz+5qcIHi31b3TYhF99C8F3DEp9eU9IR1TGHp3Wj zJhnsPSuKsYJChwaG7wdZPzv1QEzsqrUnUID+kM4pOojU1VGTRBTH4OO+5JWp8MRdeRg 2AVA== X-Gm-Message-State: AOJu0YyZ57/F7N6ezSiKe7lTk1dgAExfjX4gvupGsB8rhLdeYj1MpbN+ cqC9AOgL6pFSMlyZZgvvrILskYtwMV5gxzBpIBLycfRm133Knm2vG5tbSlxmbZfSwSzGHr/WCoe 2eg== X-Google-Smtp-Source: AGHT+IHl4quBElpISYuf2Vh44lF6guJsPPvp6D6zN1GShDAIRJGEqHpRB0HBcOsLl/wSAzzRZPkCCA== X-Received: by 2002:a05:6e02:1a24:b0:375:8b0e:444c with SMTP id e9e14a558f8ab-3761d67fed1mr56024075ab.8.1718889591280; Thu, 20 Jun 2024 06:19:51 -0700 (PDT) Received: from chromium.org (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id e9e14a558f8ab-375d866e260sm31807865ab.7.2024.06.20.06.19.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jun 2024 06:19:51 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Alexey Brodkin , Heinrich Schuchardt Subject: [PATCH 1/5] Dockerfile: Add python3-coverage Date: Thu, 20 Jun 2024 07:19:33 -0600 Message-Id: <20240620131937.1130446-2-sjg@chromium.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240620131937.1130446-1-sjg@chromium.org> References: <20240620131937.1130446-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Add this package so we can run code-coverage tests for Binman. Signed-off-by: Simon Glass --- tools/docker/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index cda87354566..0941b0f6952 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -97,6 +97,7 @@ RUN apt-get update && apt-get install -y \ python-is-python3 \ python2.7 \ python3 \ + python3-coverage \ python3-dev \ python3-pip \ python3-pyelftools \ From patchwork Thu Jun 20 13:19:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1950154 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=DVq8TpnR; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4W4h1g5kFdz20Wb for ; Thu, 20 Jun 2024 23:20:23 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E809B88541; Thu, 20 Jun 2024 15:19:57 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="DVq8TpnR"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 573F08853E; Thu, 20 Jun 2024 15:19:55 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x129.google.com (mail-il1-x129.google.com [IPv6:2607:f8b0:4864:20::129]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 458EF8852E for ; Thu, 20 Jun 2024 15:19:53 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x129.google.com with SMTP id e9e14a558f8ab-376211b3a4fso5025475ab.1 for ; Thu, 20 Jun 2024 06:19:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1718889592; x=1719494392; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=RttbVE72iKqTWkZneKSnwM5VCxPHk82fm//hR05SVzQ=; b=DVq8TpnRJf87mzUglQP3cchMWMq8mN0R5/s7PPgC7fcu5rzqlcuvPmavB6ymVnf0F7 oS6yvzymY8fj/jUjbbNw231+rHjMTS5v830TMMi4l0j8K+cQJ3snuv6sN9wnrgdwLKAL z6PH3Z6CUFVJLS4RTxuRR+zKGJZzYN0wkYU2s= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718889592; x=1719494392; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RttbVE72iKqTWkZneKSnwM5VCxPHk82fm//hR05SVzQ=; b=hYTTdT/7BWtN6ul4X42sW5gNxX7euNPFJrf3Hb4cl6CR/YXpGP4YSEPd5L79XMMg6S 0ilz+k+zaO3KpzHkiE5q4584Qg9aTYU5Gz6c0pT/dKJcqFINs64B6cbxiMEL6FsJE7kP YkO4oUKOGmDxqw3Acnl5sbpLj4dCOdRf7zxMgxDjuIOEg//eIXLpPoWtnkGTMKLzlMKX 0NcB8PCZ4uBV43jnPT5FU3+ShGGplbiOwSgD1kFIEL3Z3X3gzKpzXVGyvCb/RNv2hl5e UDkpvxK8EqyNJzzO3QDsRKUi/KKsOWID9FW+Wm/+KA7BXHUD67UUmnQVVOtGWhU/b0CX rVZQ== X-Gm-Message-State: AOJu0YyGMiHTEBRg5kgT++SUs1IZY0d+JdJlfKmZjG8hptPhhqJEHc4A hxV2d6fNDbTqbUsEu3WO6Y1YY6/g5KnsuZNNIfdjv6LknkGB0BgfRAMM8ie4mNu4Xg4jMiVfkmO +Gg== X-Google-Smtp-Source: AGHT+IEgApLWJzqCSCi1GJjDFwh/9Yu8yVd7Bt60jm2EjT33+IQU6NRMQegq7FQxgm5QAP/sR9CiQQ== X-Received: by 2002:a05:6e02:1046:b0:375:a3eb:bfcd with SMTP id e9e14a558f8ab-376094f54a2mr43328555ab.8.1718889591943; Thu, 20 Jun 2024 06:19:51 -0700 (PDT) Received: from chromium.org (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id e9e14a558f8ab-375d866e260sm31807865ab.7.2024.06.20.06.19.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jun 2024 06:19:51 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Alexey Brodkin , Heinrich Schuchardt Subject: [PATCH 2/5] Dockerfile: Add python3-pycryptodome Date: Thu, 20 Jun 2024 07:19:34 -0600 Message-Id: <20240620131937.1130446-3-sjg@chromium.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240620131937.1130446-1-sjg@chromium.org> References: <20240620131937.1130446-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean This is used by some Binman entry types, so add it to allow more tests to pass. Signed-off-by: Simon Glass --- tools/docker/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 0941b0f6952..a23504179c2 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -98,6 +98,7 @@ RUN apt-get update && apt-get install -y \ python2.7 \ python3 \ python3-coverage \ + python3-pycryptodome \ python3-dev \ python3-pip \ python3-pyelftools \ From patchwork Thu Jun 20 13:19:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1950155 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=Rd7AQ2Dx; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4W4h1v3vZcz20Wb for ; Thu, 20 Jun 2024 23:20:35 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6552A88549; Thu, 20 Jun 2024 15:20:03 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="Rd7AQ2Dx"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B05C28853F; Thu, 20 Jun 2024 15:19:56 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x144.google.com (mail-il1-x144.google.com [IPv6:2607:f8b0:4864:20::144]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 204978839C for ; Thu, 20 Jun 2024 15:19:54 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x144.google.com with SMTP id e9e14a558f8ab-376069031c7so2847975ab.0 for ; Thu, 20 Jun 2024 06:19:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1718889593; x=1719494393; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8grp6YsxZXikxJryX6pXJrcDrMs0tXjARfgbXJV/K+U=; b=Rd7AQ2DxLwQwtEvHWIqqMBl2Anw2vt1GP2WW9a9Pq6zNV7uhKu8JiLGCVVPFAMCQcI 7vq8f3sEbB6kDIP2oA2zuRwvr8Mbg2PsFe1SVRYnVkzZubSJiVsbur1SfmwBJB9M9cYz Y6/SPl+m+5YidELci/sfdeusCBp/dDFJ0O71Y= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718889593; x=1719494393; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8grp6YsxZXikxJryX6pXJrcDrMs0tXjARfgbXJV/K+U=; b=ui+zTtPnW3KLMdq2Nl6Gfke8HkCW6jwQ8NsF2ZQp5pGyednIE2qG7Ddnx2LxJuimLM CR9sE7IDbbmRzp3X6UOx7HTuvTQEM29uGwUun0wE3MP+cWH16bZ2CEtImOrgTQmbuL4O p/Yt+xhHlp0zs6zIhaFw1XDpgy3abusIp43liT7p9UqstfHtZ9ENYvQQCGg/tyG3ckb7 BnanEFV/n1C4jmYr8dPsKaeYCaPjXoG6uMKfXsH0b9xIOe/2kt8z6uFVcLvLOcvlZeyF QjbO90RpMwHpHqBhDEAZi1zxpNuKBsOt4s0SYa/Zi2xU1G6hoctFALhTxsYO2k2bh7a7 Tbfg== X-Gm-Message-State: AOJu0YxvOqcXeLVERvQ+nhyN58LR7la0VDQt4nxAFlYuQ80eoY7abdFs W3agDiDwW6jLGiAEGNGUK6Wtkr2/4XzdLWzquQvSrhsYcg9yQSUXYpAV/qjSqfttBf6TkCOJeCk jK6zz X-Google-Smtp-Source: AGHT+IF0Lh6kWa60dSBJNxY8BZgZmUi6RmWA1QeukH7GB/sbqIYO4zP4OyYcQI0akNdVMNdSB3ub+A== X-Received: by 2002:a05:6e02:219e:b0:376:17db:6031 with SMTP id e9e14a558f8ab-3761d6bb241mr60145275ab.18.1718889592707; Thu, 20 Jun 2024 06:19:52 -0700 (PDT) Received: from chromium.org (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id e9e14a558f8ab-375d866e260sm31807865ab.7.2024.06.20.06.19.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jun 2024 06:19:52 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Alexey Brodkin , Heinrich Schuchardt , Quentin Schulz Subject: [PATCH 3/5] buildman: Support building within a Python venv Date: Thu, 20 Jun 2024 07:19:35 -0600 Message-Id: <20240620131937.1130446-4-sjg@chromium.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240620131937.1130446-1-sjg@chromium.org> References: <20240620131937.1130446-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean The Python virtualenv tool sets up a few things in the envronment, putting its path first in the PATH environment variable and setting up a sys.prefix different from the sys.base_prefix value. At present buildman puts the toolchain path first in PATH so that it can be found easily during the build. For sandbox this causes problems since /usr/bin/gcc (for example) results in '/usr/bin' being prepended to the PATH variable. As a result, the venv is partially disabled. The result is that sandbox builds within a venv ignore the venv, e.g. when looking for packages. Correct this by detecting the venv and adding the toolchain path after the venv path. Signed-off-by: Simon Glass --- tools/buildman/bsettings.py | 3 ++ tools/buildman/test.py | 83 +++++++++++++++++++++++++++++++++++++ tools/buildman/toolchain.py | 31 ++++++++++++-- 3 files changed, 113 insertions(+), 4 deletions(-) diff --git a/tools/buildman/bsettings.py b/tools/buildman/bsettings.py index e225ac2ca0f..1be1d45e0fa 100644 --- a/tools/buildman/bsettings.py +++ b/tools/buildman/bsettings.py @@ -31,6 +31,9 @@ def setup(fname=''): def add_file(data): settings.readfp(io.StringIO(data)) +def add_section(name): + settings.add_section(name) + def get_items(section): """Get the items from a section of the config. diff --git a/tools/buildman/test.py b/tools/buildman/test.py index f92add7a7c5..83219182fe0 100644 --- a/tools/buildman/test.py +++ b/tools/buildman/test.py @@ -146,6 +146,7 @@ class TestBuild(unittest.TestCase): self.toolchains.Add('arm-linux-gcc', test=False) self.toolchains.Add('sparc-linux-gcc', test=False) self.toolchains.Add('powerpc-linux-gcc', test=False) + self.toolchains.Add('/path/to/aarch64-linux-gcc', test=False) self.toolchains.Add('gcc', test=False) # Avoid sending any output @@ -747,6 +748,88 @@ class TestBuild(unittest.TestCase): self.assertEqual([ ['MARY="mary"', 'Missing expected line: CONFIG_MARY="mary"']], result) + def call_make_environment(self, tchn, full_path, in_env=None): + """Call Toolchain.MakeEnvironment() and process the result + + Args: + tchn (Toolchain): Toolchain to use + full_path (bool): True to return the full path in CROSS_COMPILE + rather than adding it to the PATH variable + in_env (dict): Input environment to use, None to use current env + + Returns: + tuple: + dict: Changes that MakeEnvironment has made to the environment + key: Environment variable that was changed + value: New value (for PATH this only includes components + which were added) + str: Full value of the new PATH variable + """ + env = tchn.MakeEnvironment(full_path, env=in_env) + + # Get the original environment + orig_env = dict(os.environb if in_env is None else in_env) + orig_path = orig_env[b'PATH'].split(b':') + + # Find new variables + diff = dict((k, env[k]) for k in env if orig_env.get(k) != env[k]) + + # Find new / different path components + diff_path = None + new_path = None + if b'PATH' in diff: + new_path = diff[b'PATH'].split(b':') + diff_paths = [p for p in new_path if p not in orig_path] + diff_path = b':'.join(p for p in new_path if p not in orig_path) + if diff_path: + diff[b'PATH'] = diff_path + else: + del diff[b'PATH'] + return diff, new_path + + def test_toolchain_env(self): + """Test PATH and other environment settings for toolchains""" + # Use a toolchain which has a path, so that full_path makes a difference + tchn = self.toolchains.Select('aarch64') + + # Normal cases + diff = self.call_make_environment(tchn, full_path=False)[0] + self.assertEqual( + {b'CROSS_COMPILE': b'aarch64-linux-', b'LC_ALL': b'C', + b'PATH': b'/path/to'}, diff) + + diff = self.call_make_environment(tchn, full_path=True)[0] + self.assertEqual( + {b'CROSS_COMPILE': b'/path/to/aarch64-linux-', b'LC_ALL': b'C'}, + diff) + + # When overriding the toolchain, only LC_ALL should be set + tchn.override_toolchain = True + diff = self.call_make_environment(tchn, full_path=True)[0] + self.assertEqual({b'LC_ALL': b'C'}, diff) + + # Test that virtualenv is handled correctly + tchn.override_toolchain = False + sys.prefix = '/some/venv' + env = dict(os.environb) + env[b'PATH'] = b'/some/venv/bin:other/things' + tchn.path = '/my/path' + diff, diff_path = self.call_make_environment(tchn, False, env) + + self.assertIn(b'PATH', diff) + self.assertEqual([b'/some/venv/bin', b'/my/path', b'other/things'], + diff_path) + self.assertEqual( + {b'CROSS_COMPILE': b'aarch64-linux-', b'LC_ALL': b'C', + b'PATH': b'/my/path'}, diff) + + # Handle a toolchain wrapper + tchn.path = '' + bsettings.add_section('toolchain-wrapper') + bsettings.set_item('toolchain-wrapper', 'my-wrapper', 'fred') + diff = self.call_make_environment(tchn, full_path=True)[0] + self.assertEqual( + {b'CROSS_COMPILE': b'fred aarch64-linux-', b'LC_ALL': b'C'}, diff) if __name__ == "__main__": unittest.main() diff --git a/tools/buildman/toolchain.py b/tools/buildman/toolchain.py index 79c7c11a110..cd917d8b7eb 100644 --- a/tools/buildman/toolchain.py +++ b/tools/buildman/toolchain.py @@ -172,13 +172,14 @@ class Toolchain: else: raise ValueError('Unknown arg to GetEnvArgs (%d)' % which) - def MakeEnvironment(self, full_path): + def MakeEnvironment(self, full_path, env=None): """Returns an environment for using the toolchain. Thie takes the current environment and adds CROSS_COMPILE so that the tool chain will operate correctly. This also disables localized output and possibly unicode encoded output of all build tools by - adding LC_ALL=C. + adding LC_ALL=C. For the case where full_path is False, it prepends + the toolchain to PATH Note that os.environb is used to obtain the environment, since in some cases the environment many contain non-ASCII characters and we see @@ -187,15 +188,21 @@ class Toolchain: UnicodeEncodeError: 'utf-8' codec can't encode characters in position 569-570: surrogates not allowed + When running inside a Python venv, care is taken not to put the + toolchain path before the venv path, so that builds initiated by + buildman will still respect the venv. + Args: full_path: Return the full path in CROSS_COMPILE and don't set PATH + env (dict of bytes): Original environment, used for testing Returns: Dict containing the (bytes) environment to use. This is based on the current environment, with changes as needed to CROSS_COMPILE, PATH and LC_ALL. """ - env = dict(os.environb) + env = dict(env or os.environb) + wrapper = self.GetWrapper() if self.override_toolchain: @@ -206,7 +213,23 @@ class Toolchain: wrapper + os.path.join(self.path, self.cross)) else: env[b'CROSS_COMPILE'] = tools.to_bytes(wrapper + self.cross) - env[b'PATH'] = tools.to_bytes(self.path) + b':' + env[b'PATH'] + + # Detect a Python virtualenv and avoid defeating it + if sys.prefix != sys.base_prefix: + paths = env[b'PATH'].split(b':') + new_paths = [] + to_insert = tools.to_bytes(self.path) + insert_after = tools.to_bytes(sys.prefix) + for path in paths: + new_paths.append(path) + if to_insert and path.startswith(insert_after): + new_paths.append(to_insert) + to_insert = None + if to_insert: + new_paths.append(to_insert) + env[b'PATH'] = b':'.join(new_paths) + else: + env[b'PATH'] = tools.to_bytes(self.path) + b':' + env[b'PATH'] env[b'LC_ALL'] = b'C' From patchwork Thu Jun 20 13:19:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1950156 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=Z0SnTP1p; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4W4h276h0Kz20Wb for ; Thu, 20 Jun 2024 23:20:47 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C8A1A88551; Thu, 20 Jun 2024 15:20:03 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="Z0SnTP1p"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D524E8839C; Thu, 20 Jun 2024 15:19:56 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x12b.google.com (mail-il1-x12b.google.com [IPv6:2607:f8b0:4864:20::12b]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id AFB5D8846F for ; Thu, 20 Jun 2024 15:19:54 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12b.google.com with SMTP id e9e14a558f8ab-37594abcee7so3183125ab.0 for ; Thu, 20 Jun 2024 06:19:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1718889593; x=1719494393; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SlA9WNcIVyh8Ut8GQyUi+rz+ihpKo5MPTm/rUe0Ascg=; b=Z0SnTP1pmgk7ORe99LL+KxlVHZ8Mi4mLrE9C3Hs09XmtFwl+StpRXG1K3Rb0tkIHIv E1VvJ43zwiEmoTDlGA8+HnuNvH3WnJDFWKJ8HAjlEInkJ00B8L5axd6CfF8XOm+SNJfl VVysGWxb/dwmLJ/zR4dQo7rMFD1hJ7DnrHlIk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718889593; x=1719494393; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SlA9WNcIVyh8Ut8GQyUi+rz+ihpKo5MPTm/rUe0Ascg=; b=T5evutr7nBjuNyzgnoNGDiTd705GCoWaLxbHzeX+yNm/Ebd1gASOm7l+4uc8hbr5Iw Dk+T89x3qIuwMzkYYkw1Sx03kJL8xZb9ME2LikFKqD4BqsFPZ5BQ4WZUm3o0sEBJqS05 fmuVu+n6GZZJMlmAg2b3aZPhI+B52fIaR4yYi7FG08UgHfFHBWFHRnSf+SrfpFGojpOM T76XeiAz+Pwa3f3rgMskvRNFktV54j6qVb4np5ro7u9JMduLmkxG5wj1lWXbDmb8ccVJ NWqrlfXCCir3XKqwRvkI1qaFajGPdqYW8fIMbUKjE2/3+fyKSkxT1+hOzVzXwTB/IjR0 0arg== X-Gm-Message-State: AOJu0YzNTKQ1/rmWBCfCQL1lIiLO1QwVvdV48J716zSvKygnCIV2otVJ uoVGZji2OURfSr0HRTsCXSglTwTnyy8769NcJYC6bRGCi0Wqnr9XnWn5MggA0ayx3ilK0Ojxn9G e7A== X-Google-Smtp-Source: AGHT+IEyB/bNO6RwEO2XAEY3tfG8PX69ejk54FeDqh/plB5Zkc7W7nVCInu62v5kVUhdgi3RxblDhw== X-Received: by 2002:a92:c24d:0:b0:375:be9e:34da with SMTP id e9e14a558f8ab-3761d685e71mr57520555ab.2.1718889593359; Thu, 20 Jun 2024 06:19:53 -0700 (PDT) Received: from chromium.org (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id e9e14a558f8ab-375d866e260sm31807865ab.7.2024.06.20.06.19.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jun 2024 06:19:53 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH 4/5] u_boot_pylib: Use correct coverage tool within venv Date: Thu, 20 Jun 2024 07:19:36 -0600 Message-Id: <20240620131937.1130446-5-sjg@chromium.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240620131937.1130446-1-sjg@chromium.org> References: <20240620131937.1130446-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean When running within a Python venv we must use the 'coverage' tool (which is within the venv) so that the venv packages are used in preference to system packages. Otherwise the coverage tests run in a different environment from the normal tests and may fail due to missing packages. Handle this by detecting the venv and changing the tool name. Signed-off-by: Simon Glass --- tools/u_boot_pylib/test_util.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/tools/u_boot_pylib/test_util.py b/tools/u_boot_pylib/test_util.py index f18d385d995..857ce58c98c 100644 --- a/tools/u_boot_pylib/test_util.py +++ b/tools/u_boot_pylib/test_util.py @@ -60,12 +60,17 @@ def run_test_coverage(prog, filter_fname, exclude_list, build_dir, required=None prefix = '' if build_dir: prefix = 'PYTHONPATH=$PYTHONPATH:%s/sandbox_spl/tools ' % build_dir - cmd = ('%spython3-coverage run ' - '--omit "%s" %s %s %s %s' % (prefix, ','.join(glob_list), + + # Detect a Python virtualenv and use 'coverage' instead + covtool = ('python3-coverage' if sys.prefix == sys.base_prefix else + 'coverage') + + cmd = ('%s%s run ' + '--omit "%s" %s %s %s %s' % (prefix, covtool, ','.join(glob_list), prog, extra_args or '', test_cmd, single_thread or '-P1')) os.system(cmd) - stdout = command.output('python3-coverage', 'report') + stdout = command.output(covtool, 'report') lines = stdout.splitlines() if required: # Convert '/path/to/name.py' just the module name 'name' From patchwork Thu Jun 20 13:19:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1950157 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=NQ0JeubA; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4W4h2M0dHlz20Wb for ; Thu, 20 Jun 2024 23:20:59 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2E5738855E; Thu, 20 Jun 2024 15:20:04 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="NQ0JeubA"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8558C8846F; Thu, 20 Jun 2024 15:19:57 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x12b.google.com (mail-il1-x12b.google.com [IPv6:2607:f8b0:4864:20::12b]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 5EA4C88385 for ; Thu, 20 Jun 2024 15:19:55 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12b.google.com with SMTP id e9e14a558f8ab-375fb45f465so2718145ab.1 for ; Thu, 20 Jun 2024 06:19:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1718889594; x=1719494394; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ePRPLYEqoA6fcFBcClqbO6dFw5xoU1YwTXbb0Z2vPJk=; b=NQ0JeubAUYA6kBLQqsxrVQIsUwEnQb9QDgxGvm/YPhhlBhu7JOTeUTuHp3s1EN3LMU H5V370r2ffG7sKoVgC8tmE7+6KN4CUc/yMZCYe7f7vtilF8ZD3ycq0ph1ITizaUrQ2BT hT483N4B59tecXazIWGebZhfU6f4lu0k/J9SI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718889594; x=1719494394; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ePRPLYEqoA6fcFBcClqbO6dFw5xoU1YwTXbb0Z2vPJk=; b=gAoJvAmE7PrjqgGAIXW9Py5P2Cf6R2wo76NMQypsXUAG5wbfDfvRyfC1RW0+erWj4q RynLC/hUs5hnfjOc1IvwzYr6dcI+WoKFT4npKnzoDfAR3xUBkx7YGorYqPeDCMXxFfnB becIYK2JNeJXIhzbG083uPiPzOxCuElbQf2A4SGdCgi6v/NonTTcLF5LY/RVRB1sAD4u GYsyGDrhCXsl2FkfTn8n8z3WQcshyol4eJZCJ6JGk+xp4/z+ZYch9aEe5BW3bectuUfT OaAAUjD3AjF+t6umlElyULJI7R/IcLWQIqXzBagk8gZCafd4sqa1Pvi1nMZYCdBIJEEJ 6e+A== X-Gm-Message-State: AOJu0YwqtORRT1e0tYYNPEd2zS1cOiej+S3lyflNDOV5N9mxbRq+8kma OtcJ717zhHm1+L8gfGv0cYbdIVK/RUNDPMaqW3VWEHw6AovhvWSl2iYdWh81Ff7J4Xbx3z2PIyz Gcw== X-Google-Smtp-Source: AGHT+IFyZOHCd7ntnvH1I/punUAXK5UOPtZu0Aml0C2J4ehCiaQhwbs7Sj86ssy9gtAqjPtNRZGH2w== X-Received: by 2002:a05:6e02:154d:b0:375:ac51:9c5d with SMTP id e9e14a558f8ab-3761d6bfa8dmr61682165ab.12.1718889594064; Thu, 20 Jun 2024 06:19:54 -0700 (PDT) Received: from chromium.org (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id e9e14a558f8ab-375d866e260sm31807865ab.7.2024.06.20.06.19.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jun 2024 06:19:53 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Andrejs Cainikovs , Leo Yu-Chi Liang , Marek Vasut , Sean Anderson Subject: [PATCH 5/5] CI: Run code-coverage test for Binman Date: Thu, 20 Jun 2024 07:19:37 -0600 Message-Id: <20240620131937.1130446-6-sjg@chromium.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240620131937.1130446-1-sjg@chromium.org> References: <20240620131937.1130446-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Binman includes a good set of tests covering all of its functionality. This includes a code-coverage test. However to date the code-coverage test has not been checked automatically by CI, relying on people to run 'binman test -T' themselves. Plug the gap to avoid bugs creeping in future. Signed-off-by: Simon Glass --- .gitlab-ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 165f765a833..eb01fa4868d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -201,7 +201,9 @@ Run binman, buildman, dtoc, Kconfig and patman testsuites: ./tools/buildman/buildman -T0 -o ${UBOOT_TRAVIS_BUILD_DIR} -w --board tools-only; set -e; - ./tools/binman/binman --toolpath ${UBOOT_TRAVIS_BUILD_DIR}/tools test; + export TOOLPATH="--toolpath ${UBOOT_TRAVIS_BUILD_DIR}/tools --toolpath /opt/coreboot"; + ./tools/binman/binman ${TOOLPATH} test; + ./tools/binman/binman ${TOOLPATH} test -T; ./tools/buildman/buildman -t; ./tools/dtoc/dtoc -t; ./tools/patman/patman test;