[05/20] gitlab: Use the -w option for sandbox_spl

Message ID 20200306200644.5.I31d30fb8031fe55a91aa0877c6754ccdf2ca1a50@changeid
State New
Headers show
Series
  • gitlab: Simplify the test script
Related show

Commit Message

Simon Glass March 7, 2020, 3:07 a.m.
Avoid needing to know about the internal .bm-work directory, by passing
the -w flag to buildman.

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

 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Tom Rini March 9, 2020, 5:50 p.m. | #1
On Fri, Mar 06, 2020 at 08:07:19PM -0700, Simon Glass wrote:

> Avoid needing to know about the internal .bm-work directory, by passing
> the -w flag to buildman.
> 
> Signed-off-by: Simon Glass <sjg at chromium.org>
> ---
> 
>  .gitlab-ci.yml | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

What I'd like to see is GitLab / Azure / Travis changing in-sync with
these steps, rather than one commit for each (and Travis getting out of
sync).  Thanks!

Patch

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 55943bb3a2..248e0530d2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -167,10 +167,10 @@  Run binman, buildman, dtoc and patman testsuites:
       virtualenv -p /usr/bin/python3 /tmp/venv;
       . /tmp/venv/bin/activate;
       pip install pyelftools;
-      export UBOOT_TRAVIS_BUILD_DIR=/tmp/.bm-work/sandbox_spl;
+      export UBOOT_TRAVIS_BUILD_DIR=/tmp/sandbox_spl;
       export PYTHONPATH="${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc/pylibfdt";
       export PATH="${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc:${PATH}";
-      ./tools/buildman/buildman -o /tmp -P sandbox_spl;
+      ./tools/buildman/buildman -o ${UBOOT_TRAVIS_BUILD_DIR} -w sandbox_spl;
       ./tools/binman/binman --toolpath ${UBOOT_TRAVIS_BUILD_DIR}/tools test;
       ./tools/buildman/buildman -t;
       ./tools/dtoc/dtoc -t;