diff options
| author | Scott Shawcroft <scott@tannewt.org> | 2018-07-30 12:33:44 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-30 12:33:44 -0700 |
| commit | a6d94b68453b8535398ff0b61cd6c4a0c7f77f8b (patch) | |
| tree | 8defd6392975b8145dc11f0cce9c39a4e440b32a /.travis.yml | |
| parent | 433a29bb70d51abb84c77a911ced43c6ff14706e (diff) | |
| parent | b1006170f1dcfa3a9499ef31c19c8f20736b136a (diff) | |
Merge pull request #1068 from dhalbert/micropython-25ae98f-merge
Micropython 25ae98f merge
Diffstat (limited to '.travis.yml')
| -rwxr-xr-x | .travis.yml | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index feefb2cda..edad9d482 100755 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,6 @@ env: - TRAVIS_BOARD=hallowing_m0_express - TRAVIS_BOARD=feather52832 - TRAVIS_BOARD=pca10056 - - TRAVIS_TEST=qemu - TRAVIS_TEST=unix - TRAVIS_TEST=docs @@ -50,9 +49,7 @@ notifications: before_script: - sudo dpkg --add-architecture i386 - - ([[ -z "$TRAVIS_TEST" ]] || sudo apt-get install -y qemu-system) - ([[ -z "$TRAVIS_BOARD" ]] || (wget https://s3.amazonaws.com/adafruit-circuit-python/gcc-arm-embedded_7-2018q2-1~trusty1_amd64.deb && sudo dpkg -i gcc-arm-embedded*_amd64.deb)) - - ([[ $TRAVIS_TEST != "qemu" ]] || (wget https://s3.amazonaws.com/adafruit-circuit-python/gcc-arm-embedded_7-2018q2-1~trusty1_amd64.deb && sudo dpkg -i gcc-arm-embedded*_amd64.deb)) # For nrf builds - ([[ $TRAVIS_BOARD != "feather52832" && $TRAVIS_BOARD != "pca10056" ]] || sudo ports/nrf/drivers/bluetooth/download_ble_stack.sh) @@ -81,10 +78,6 @@ script: - ([[ $TRAVIS_TEST != "unix" ]] || make -C ports/unix coverage -j2) - echo -en 'travis_fold:end:unix\\r' - - echo 'Building qemu' && echo -en 'travis_fold:start:qemu\\r' - - ([[ $TRAVIS_TEST != "qemu" ]] || make -C ports/qemu-arm test -j2) - - echo -en 'travis_fold:end:qemu\\r' - # run tests without coverage info #- (cd tests && MICROPY_CPYTHON3=python3.4 ./run-tests -j1) #- (cd tests && MICROPY_CPYTHON3=python3.4 ./run-tests -j1 --emit native) @@ -116,4 +109,3 @@ script: after_failure: - (cd tests && for exp in *.exp; do testbase=$(basename $exp .exp); echo -e "\nFAILURE $testbase"; diff -u $testbase.exp $testbase.out; done) - - (grep "FAIL" ports/qemu-arm/build/console.out) |