diff options
| author | Simon Glass <sjg@chromium.org> | 2020-03-18 09:42:56 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-04-10 21:32:53 -0400 |
| commit | 4080d0970d2cfe04562cc84afb47c5b33811700e (patch) | |
| tree | 3b771a89ba44b3e6ca7020cd60ee64e04270c8a6 /.travis.yml | |
| parent | 4e32fed4d3e068d6dc859c2aec86b8487646e805 (diff) | |
| download | u-boot-4080d0970d2cfe04562cc84afb47c5b33811700e.zip u-boot-4080d0970d2cfe04562cc84afb47c5b33811700e.tar.gz u-boot-4080d0970d2cfe04562cc84afb47c5b33811700e.tar.bz2 | |
travis/gitlab/azure: Use bash to avoid a_test_which_does_not_exist
Bash allows for variables to expand only if non-empty:
$ var=test
$ echo ${var:+"$var"}
test
$ echo ${var:+"-k $var"}
-k test
$ var=
$ echo ${var:+"-k $var"}
Use this feature to avoid the workaround.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 43a0b7b..c19eadd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -215,11 +215,8 @@ script: exit $ret; fi; fi - # "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 - # "-k something" even when $TEST_PY_TEST_SPEC doesnt need a custom - # value. # Build just the one board needed for testing, if TEST_PY_BD is non-empty + # Note: "${var:+"-k $var"}" expands to "" if $var is empty, "-k $var" if not - if [[ "${TEST_PY_BD}" != "" ]]; then export UBOOT_TRAVIS_BUILD_DIR=`cd .. && pwd`/${TEST_PY_BD}; cp ~/grub_x86.efi $UBOOT_TRAVIS_BUILD_DIR/; @@ -248,7 +245,7 @@ script: . /tmp/venv/bin/activate; pip install -r test/py/requirements.txt; ./test/py/test.py --bd ${TEST_PY_BD} ${TEST_PY_ID} - -k "${TEST_PY_TEST_SPEC:-not a_test_which_does_not_exist}" + ${TEST_PY_TEST_SPEC:+"-k ${TEST_PY_TEST_SPEC}"} --build-dir "$UBOOT_TRAVIS_BUILD_DIR"; ret=$?; if [[ $ret -ne 0 ]]; then |