GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-06-27 09:02:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gitlab/azure: Drop unnecessary if..fi when using test.py

Browse source 
Since TEST_PY_BD is always defined we can drop this check.

This does not affect travis since it has a single, unified script.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Simon Glass 2020-03-18 09:42:54 -06:00 • committed by Tom Rini
parent b52f5a1958
commit 5bd95d63d1
2 changed files with 22 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

22
.azure-pipelines.yml
View file

@ -264,13 +264,11 @@ jobs:
fi fi
# the below corresponds to .gitlab-ci.yml "script" # the below corresponds to .gitlab-ci.yml "script"
cd ${WORK_DIR} cd ${WORK_DIR}
if [[ "${TEST_PY_BD}" != "" ]]; then ret=0;
ret=0; tools/buildman/buildman -o /tmp -P -E --board ${TEST_PY_BD} ${OVERRIDE} || ret=$?;
tools/buildman/buildman -o /tmp -P -E --board ${TEST_PY_BD} ${OVERRIDE} || ret=$?; if [[ $ret -ne 0 && $ret -ne 129 ]]; then
if [[ $ret -ne 0 && $ret -ne 129 ]]; then tools/buildman/buildman -o /tmp -seP --board ${TEST_PY_BD};
tools/buildman/buildman -o /tmp -seP --board ${TEST_PY_BD}; exit $ret;
exit $ret;
fi;
fi fi
virtualenv -p /usr/bin/python3 /tmp/venv virtualenv -p /usr/bin/python3 /tmp/venv
. /tmp/venv/bin/activate . /tmp/venv/bin/activate
@ -278,12 +276,10 @@ jobs:
export UBOOT_TRAVIS_BUILD_DIR=/tmp/.bm-work/${TEST_PY_BD}; export UBOOT_TRAVIS_BUILD_DIR=/tmp/.bm-work/${TEST_PY_BD};
export PATH=/opt/qemu/bin:/tmp/uboot-test-hooks/bin:${PATH}; export PATH=/opt/qemu/bin:/tmp/uboot-test-hooks/bin:${PATH};
export PYTHONPATH=/tmp/uboot-test-hooks/py/travis-ci; export PYTHONPATH=/tmp/uboot-test-hooks/py/travis-ci;
if [[ "${TEST_PY_BD}" != "" ]]; then ./test/py/test.py --bd ${TEST_PY_BD} ${TEST_PY_ID} -k "${TEST_PY_TEST_SPEC:-not a_test_which_does_not_exist}" --build-dir "$UBOOT_TRAVIS_BUILD_DIR";
./test/py/test.py --bd ${TEST_PY_BD} ${TEST_PY_ID} -k "${TEST_PY_TEST_SPEC:-not a_test_which_does_not_exist}" --build-dir "$UBOOT_TRAVIS_BUILD_DIR"; ret=$?;
ret=$?; if [[ $ret -ne 0 ]]; then
if [[ $ret -ne 0 ]]; then exit $ret;
exit $ret;
fi;
fi fi
# the below corresponds to .gitlab-ci.yml "after_script" # the below corresponds to .gitlab-ci.yml "after_script"
rm -rf /tmp/uboot-test-hooks /tmp/venv rm -rf /tmp/uboot-test-hooks /tmp/venv

30
.gitlab-ci.yml
View file

@ -38,14 +38,12 @@ stages:
script: script:
# From buildman, exit code 129 means warnings only. If we've been asked to # From buildman, exit code 129 means warnings only. If we've been asked to
# use clang only do one configuration. # use clang only do one configuration.
- if [[ "${TEST_PY_BD}" != "" ]]; then - ret=0;
ret=0; tools/buildman/buildman -o /tmp -P -E --board ${TEST_PY_BD} ${OVERRIDE}
tools/buildman/buildman -o /tmp -P -E --board ${TEST_PY_BD} ${OVERRIDE} || ret=$?;
|| ret=$?; if [[ $ret -ne 0 && $ret -ne 129 ]]; then
if [[ $ret -ne 0 && $ret -ne 129 ]]; then tools/buildman/buildman -o /tmp -seP --board ${TEST_PY_BD};
tools/buildman/buildman -o /tmp -seP --board ${TEST_PY_BD}; exit $ret;
exit $ret;
fi;
fi fi
# "not a_test_which_does_not_exist" is a dummy -k parameter which will # "not a_test_which_does_not_exist" is a dummy -k parameter which will
# never prevent any test from running. That way, we can always pass # never prevent any test from running. That way, we can always pass
@ -57,15 +55,13 @@ stages:
- export UBOOT_TRAVIS_BUILD_DIR=/tmp/.bm-work/${TEST_PY_BD}; - export UBOOT_TRAVIS_BUILD_DIR=/tmp/.bm-work/${TEST_PY_BD};
export PATH=/opt/qemu/bin:/tmp/uboot-test-hooks/bin:${PATH}; export PATH=/opt/qemu/bin:/tmp/uboot-test-hooks/bin:${PATH};
export PYTHONPATH=/tmp/uboot-test-hooks/py/travis-ci; export PYTHONPATH=/tmp/uboot-test-hooks/py/travis-ci;
if [[ "${TEST_PY_BD}" != "" ]]; then ./test/py/test.py --bd ${TEST_PY_BD} ${TEST_PY_ID}
./test/py/test.py --bd ${TEST_PY_BD} ${TEST_PY_ID} -k "${TEST_PY_TEST_SPEC:-not a_test_which_does_not_exist}"
-k "${TEST_PY_TEST_SPEC:-not a_test_which_does_not_exist}" --build-dir "$UBOOT_TRAVIS_BUILD_DIR";
--build-dir "$UBOOT_TRAVIS_BUILD_DIR"; ret=$?;
ret=$?; if [[ $ret -ne 0 ]]; then
if [[ $ret -ne 0 ]]; then exit $ret;
exit $ret; fi
fi;
fi;
build all 32bit ARM platforms: build all 32bit ARM platforms:
tags: [ 'all' ] tags: [ 'all' ]