diff options
| author | Simon Glass <sjg@chromium.org> | 2020-03-18 09:42:54 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-04-10 21:32:41 -0400 |
| commit | 5bd95d63d12395708f9377b971934da264dab43b (patch) | |
| tree | 040c770177acd59766589ef29e1a7d1a40cb9ec4 /.azure-pipelines.yml | |
| parent | b52f5a1958fd1047da723a15f2a24dd849daac2c (diff) | |
| download | u-boot-5bd95d63d12395708f9377b971934da264dab43b.tar.gz | |
gitlab/azure: Drop unnecessary if..fi when using test.py
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>
Diffstat (limited to '.azure-pipelines.yml')
| -rw-r--r-- | .azure-pipelines.yml | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index a95233f136..21ad1522ee 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -264,13 +264,11 @@ jobs: fi # the below corresponds to .gitlab-ci.yml "script" cd ${WORK_DIR} - if [[ "${TEST_PY_BD}" != "" ]]; then - ret=0; - tools/buildman/buildman -o /tmp -P -E --board ${TEST_PY_BD} ${OVERRIDE} || ret=$?; - if [[ $ret -ne 0 && $ret -ne 129 ]]; then - tools/buildman/buildman -o /tmp -seP --board ${TEST_PY_BD}; - exit $ret; - fi; + ret=0; + tools/buildman/buildman -o /tmp -P -E --board ${TEST_PY_BD} ${OVERRIDE} || ret=$?; + if [[ $ret -ne 0 && $ret -ne 129 ]]; then + tools/buildman/buildman -o /tmp -seP --board ${TEST_PY_BD}; + exit $ret; fi virtualenv -p /usr/bin/python3 /tmp/venv . /tmp/venv/bin/activate @@ -278,12 +276,10 @@ jobs: export UBOOT_TRAVIS_BUILD_DIR=/tmp/.bm-work/${TEST_PY_BD}; export PATH=/opt/qemu/bin:/tmp/uboot-test-hooks/bin:${PATH}; 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"; - ret=$?; - if [[ $ret -ne 0 ]]; then - exit $ret; - fi; + ./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=$?; + if [[ $ret -ne 0 ]]; then + exit $ret; fi # the below corresponds to .gitlab-ci.yml "after_script" rm -rf /tmp/uboot-test-hooks /tmp/venv |