From 7570a6b29dbb171ef4512c0b499e76ccc82772c8 Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Sat, 17 Nov 2018 08:47:13 +0100 Subject: [PATCH 1/2] Skip running tests with coverage for now --- .travis.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 14d5df0a4..cd8bddfed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,18 +49,18 @@ script: - make -C windows CROSS_COMPILE=i686-w64-mingw32- # run tests without coverage info - #- (cd tests && MICROPY_CPYTHON3=python3.4 ./run-tests) - #- (cd tests && MICROPY_CPYTHON3=python3.4 ./run-tests --emit native) + - (cd tests && MICROPY_CPYTHON3=python3.4 ./run-tests) + - (cd tests && MICROPY_CPYTHON3=python3.4 ./run-tests --emit native) # run tests with coverage info - - make -C unix coverage - - (cd tests && MICROPY_CPYTHON3=python3.4 MICROPY_MICROPYTHON=../unix/micropython_coverage ./run-tests) - - (cd tests && MICROPY_CPYTHON3=python3.4 MICROPY_MICROPYTHON=../unix/micropython_coverage ./run-tests -d thread) - - (cd tests && MICROPY_CPYTHON3=python3.4 MICROPY_MICROPYTHON=../unix/micropython_coverage ./run-tests --emit native) - - (cd tests && MICROPY_CPYTHON3=python3.4 MICROPY_MICROPYTHON=../unix/micropython_coverage ./run-tests --via-mpy -d basics float) + #- make -C unix coverage + #- (cd tests && MICROPY_CPYTHON3=python3.4 MICROPY_MICROPYTHON=../unix/micropython_coverage ./run-tests) + #- (cd tests && MICROPY_CPYTHON3=python3.4 MICROPY_MICROPYTHON=../unix/micropython_coverage ./run-tests -d thread) + #- (cd tests && MICROPY_CPYTHON3=python3.4 MICROPY_MICROPYTHON=../unix/micropython_coverage ./run-tests --emit native) + #- (cd tests && MICROPY_CPYTHON3=python3.4 MICROPY_MICROPYTHON=../unix/micropython_coverage ./run-tests --via-mpy -d basics float) # run coveralls coverage analysis (try to, even if some builds/tests failed) - - (cd unix && coveralls --root .. --build-root . --gcov $(which gcov) --gcov-options '\-o build-coverage/' --include py --include extmod) + #- (cd unix && coveralls --root .. --build-root . --gcov $(which gcov) --gcov-options '\-o build-coverage/' --include py --include extmod) after_failure: - (cd tests && for exp in *.exp; do testbase=$(basename $exp .exp); echo -e "\nFAILURE $testbase"; diff -u $testbase.exp $testbase.out; done) From 78df140e7fdde3a205672f978c5df587b40d5c99 Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Sat, 17 Nov 2018 09:06:21 +0100 Subject: [PATCH 2/2] Make 'micropython' explicitly --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cd8bddfed..4b0ba9c14 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,7 +35,7 @@ script: # Save new firmware for reference, but only if building a main branch, not a pull request - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then cp minimal/build/firmware.bin ${HOME}/persist/; fi' - make -C unix deplibs - - make -C unix + - make -C unix micropython - make -C unix nanbox - make -C bare-arm - make -C qemu-arm test