diff --git a/.gitignore b/.gitignore index 8a121b9..c09223a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +.cache/ _attic/ build/ *.o diff --git a/script/test b/script/test index 460b711..69e098d 100755 --- a/script/test +++ b/script/test @@ -6,19 +6,10 @@ set -e cd "$(dirname "$0")/.." -if [ \! -d device_tests ]; then - curl -s -L https://github.com/trezor/python-trezor/archive/master.tar.gz | tar -xvz --strip-components=2 python-trezor-master/tests/device_tests -fi +if [ "$EMULATOR" = 1 ]; then + trap "kill %1" EXIT -# Kill jobs on exit -trap "exit" INT TERM -trap "kill 0" EXIT - -if [ "$EMULATOR" = 1 ] && [ -z "$(pidof trezor.elf)" ]; then firmware/trezor.elf & fi -TREZOR_TRANSPORT_V1=1 pytest "device_tests" & - -# Wait for either job to exit and kill the other -wait -n +TREZOR_TRANSPORT_V1=1 "${PYTHON:-python}" -m pytest --pyarg trezorlib.tests.device_tests "$@"