diff options
| author | Tom Rini <trini@konsulko.com> | 2021-03-23 09:11:47 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-03-23 09:59:30 -0400 |
| commit | c9110e5babfeb25ccbce19ccc4d8a8ded8feb718 (patch) | |
| tree | 560751c8c151933fd7bcca3f2531629d1ff980f3 | |
| parent | da2a0cd70f7478b6b5c0c8ac33493e422dde13ba (diff) | |
| download | u-boot-WIP/next-debug.tar.gz | |
TEST: Exit if UBOOT_TRAVIS_BUILD_DIR already existsWIP/next-debug
Signed-off-by: Tom Rini <trini@konsulko.com>
| -rw-r--r-- | .azure-pipelines.yml | 2 | ||||
| -rw-r--r-- | .gitlab-ci.yml | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index ec2f260997..344b6f7ea6 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -145,6 +145,7 @@ jobs: virtualenv -p /usr/bin/python3 /tmp/venv . /tmp/venv/bin/activate pip install pyelftools pytest pygit2 + [ -d ${UBOOT_TRAVIS_BUILD_DIR} ] && exit 100 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} @@ -314,6 +315,7 @@ jobs: # the below corresponds to .gitlab-ci.yml "script" cd ${WORK_DIR} export UBOOT_TRAVIS_BUILD_DIR=/tmp/${TEST_PY_BD}; + [ -d ${UBOOT_TRAVIS_BUILD_DIR} ] && exit 100 tools/buildman/buildman -o ${UBOOT_TRAVIS_BUILD_DIR} -w -E -W -e --board ${TEST_PY_BD} ${OVERRIDE} cp ~/grub_x86.efi ${UBOOT_TRAVIS_BUILD_DIR}/ cp ~/grub_x64.efi ${UBOOT_TRAVIS_BUILD_DIR}/ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 64e341c262..91bfa005f0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -34,7 +34,8 @@ stages: script: # If we've been asked to use clang only do one configuration. - export UBOOT_TRAVIS_BUILD_DIR=/tmp/${TEST_PY_BD} - - tools/buildman/buildman -o ${UBOOT_TRAVIS_BUILD_DIR} -w -E -W -e + - if [ -d ${UBOOT_TRAVIS_BUILD_DIR} ]; then exit 100; fi ; + tools/buildman/buildman -o ${UBOOT_TRAVIS_BUILD_DIR} -w -E -W -e --board ${TEST_PY_BD} ${OVERRIDE} - cp ~/grub_x86.efi $UBOOT_TRAVIS_BUILD_DIR/ - cp ~/grub_x64.efi $UBOOT_TRAVIS_BUILD_DIR/ @@ -168,6 +169,7 @@ Run binman, buildman, dtoc, Kconfig and patman testsuites: 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}"; + [ -d ${UBOOT_TRAVIS_BUILD_DIR} ] && exit 100; ./tools/buildman/buildman -T0 -o ${UBOOT_TRAVIS_BUILD_DIR} -w --board sandbox_spl; ./tools/binman/binman --toolpath ${UBOOT_TRAVIS_BUILD_DIR}/tools test; |