diff mbox series

[Concept,14/15] test/run: Tidy up the tool path for binman

Message ID	20250819193918.874215-15-sjg@u-boot.org
State	New
Headers	From: Simon Glass <sjg@u-boot.org> To: U-Boot Concept <concept@u-boot.org> Date: Tue, 19 Aug 2025 13:39:10 -0600 Message-ID: <20250819193918.874215-15-sjg@u-boot.org> In-Reply-To: <20250819193918.874215-1-sjg@u-boot.org> References: <20250819193918.874215-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: SMJ3AVSWNUIDLS3H7Z3MCDZQQ4O2VVNL CC: Simon Glass <sjg@chromium.org> Precedence: list Subject: [Concept] [PATCH 14/15] test/run: Tidy up the tool path for binman Archived-At: <https://lists.u-boot.org/archives/list/concept@u-boot.org/message/SMJ3AVSWNUIDLS3H7Z3MCDZQQ4O2VVNL/> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit
Series	test: Improvements to make check et al \| [Concept,00/15] test: Improvements to make check et al [Concept,01/15] patman: Drop hard-coded patchwork server [Concept,02/15] patman: Handle invalid characters in patch files [Concept,04/15] malloc: Avoid defining calloc() [Concept,05/15] buildman: Deal with DTC in environemnt in test_skip_dtc() [Concept,06/15] buildman: Fix pylint warning in test_skip_dtc() [Concept,07/15] buildman: Handle CPP being in the environment [Concept,08/15] buildman: Handle CROSS_COMPILE being in the environment [Concept,09/15] dtoc: Add a test for the fdt_util.EnsureCompiled with indir [Concept,10/15] test: Update test_fdt_add_pubkey() to use a separate dir [Concept,11/15] test/run: Provide the full path to dtc [Concept,12/15] test/run: Skip xPL tests with make tcheck [Concept,13/15] test/run: Run more quietly [Concept,14/15] test/run: Tidy up the tool path for binman [Concept,15/15] CI: Check that make check et al work correctly

Commit Message

Simon Glass Aug. 19, 2025, 7:39 p.m. UTC

  From: Simon Glass <sjg@chromium.org>

Binman needs access to tools like mkimage and cbfstool to run all the
tests. Set up the TOOLS_DIR earlier and allow use of a TOOLS_DIR
environment variable to specify where the tools are. This can be used
from CI, for example.

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

 test/run | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff mbox series

Patch

diff --git a/test/run b/test/run
index 1f60fc8fb61..f6d39989fb8 100755
--- a/test/run
+++ b/test/run
@@ -90,9 +90,12 @@  fi
 DTC_DIR=$(pwd)/build-sandbox_spl/scripts/dtc
 export PYTHONPATH=${DTC_DIR}/pylibfdt
 export DTC=${DTC_DIR}/dtc
-TOOLS_DIR=build-sandbox_spl/tools
+TOOLS_DIR=$(pwd)/build-sandbox_spl/tools
 
-run_test "binman" ./tools/binman/binman --toolpath ${TOOLS_DIR} test
+# TOOLPATH may be defined to provide mkimage, cbfstool, etc.
+export PATH=$PATH:${TOOLS_DIR}
+
+run_test "binman" ./tools/binman/binman ${TOOLPATH} test
 run_test "patman" ./tools/patman/patman test
 run_test "u_boot_pylib" ./tools/u_boot_pylib/u_boot_pylib
 
@@ -106,8 +109,7 @@  run_test "dtoc" ./tools/dtoc/dtoc -t
 
 # Code-coverage tests cannot run in parallel, so skip them in that case
 if [ -z "${para}" ]; then
-	export PATH=$PATH:${TOOLS_DIR}
-	run_test "binman code coverage" ./tools/binman/binman test -T
+	run_test "binman code coverage" ./tools/binman/binman ${TOOLPATH} test -T
 	run_test "dtoc code coverage" ./tools/dtoc/dtoc -T
 	run_test "fdt code coverage" ./tools/dtoc/test_fdt -T
 fi