summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2020-03-18 09:42:48 -0600
committerTom Rini <trini@konsulko.com>2020-04-10 21:22:45 -0400
commitf08c8ef9b7d7cf8bbdb744636f64515ac072569d (patch)
tree98e5b3c1397dd49d802db95a1979f95ac2e5c75b /.travis.yml
parent4e9162d519c83812624c327731048a93631dc194 (diff)
travis: Don't copy files into .bm-work/
At present if TEST_PY_BD is empty the script copies various files into a directory, to no purpose. This happens because UBOOT_TRAVIS_BUILD_DIR is set before TEST_PY_BD is tested. Move the 'if' to fix this. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml32
1 files changed, 16 insertions, 16 deletions
diff --git a/.travis.yml b/.travis.yml
index 5309a0bf4e..601a50d202 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -218,22 +218,22 @@ script:
# 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.
- - export UBOOT_TRAVIS_BUILD_DIR=`cd .. && pwd`/.bm-work/${TEST_PY_BD};
- cp ~/grub_x86.efi $UBOOT_TRAVIS_BUILD_DIR/;
- cp ~/grub_x64.efi $UBOOT_TRAVIS_BUILD_DIR/;
- if [[ -e ~/grub_arm.efi ]]; then
- cp ~/grub_arm.efi $UBOOT_TRAVIS_BUILD_DIR/;
- fi;
- if [[ -e ~/grub_arm64.efi ]]; then
- cp ~/grub_arm64.efi $UBOOT_TRAVIS_BUILD_DIR/;
- fi;
- if [[ -e ~/grub_riscv32.efi ]]; then
- cp ~/grub_riscv32.efi $UBOOT_TRAVIS_BUILD_DIR/;
- fi;
- if [[ -e ~/grub_riscv64.efi ]]; then
- cp ~/grub_riscv64.efi $UBOOT_TRAVIS_BUILD_DIR/;
- fi;
- if [[ "${TEST_PY_BD}" != "" ]]; then
+ - if [[ "${TEST_PY_BD}" != "" ]]; then
+ export UBOOT_TRAVIS_BUILD_DIR=`cd .. && pwd`/.bm-work/${TEST_PY_BD};
+ cp ~/grub_x86.efi $UBOOT_TRAVIS_BUILD_DIR/;
+ cp ~/grub_x64.efi $UBOOT_TRAVIS_BUILD_DIR/;
+ if [[ -e ~/grub_arm.efi ]]; then
+ cp ~/grub_arm.efi $UBOOT_TRAVIS_BUILD_DIR/;
+ fi;
+ if [[ -e ~/grub_arm64.efi ]]; then
+ cp ~/grub_arm64.efi $UBOOT_TRAVIS_BUILD_DIR/;
+ fi;
+ if [[ -e ~/grub_riscv32.efi ]]; then
+ cp ~/grub_riscv32.efi $UBOOT_TRAVIS_BUILD_DIR/;
+ fi;
+ if [[ -e ~/grub_riscv64.efi ]]; then
+ cp ~/grub_riscv64.efi $UBOOT_TRAVIS_BUILD_DIR/;
+ fi;
virtualenv -p /usr/bin/python3 /tmp/venv;
. /tmp/venv/bin/activate;
pip install -r test/py/requirements.txt;