Commit 499d50be authored by Andrew Scheller's avatar Andrew Scheller
Browse files

Merge remote-tracking branch 'upstream/master' into patch-1

Conflicts:
	.travis.yml
parents 16fecc0a 8c1bec4a
......@@ -4,15 +4,16 @@ compiler:
before_script:
- sudo add-apt-repository -y ppa:fkrull/deadsnakes
- sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
- sudo add-apt-repository -y ppa:terry.guo/gcc-arm-embedded
- sudo apt-get update -qq
- sudo apt-get install -y python3.3 python3 gcc-arm-none-eabi
- sudo apt-get install -y python3.3 python3 gcc-4.7 gcc-arm-none-eabi
script:
- make -C bare-arm
- make -C stmhal
- make -C unix-cpy
- make -C unix
- make -C bare-arm CC=gcc-4.7
- make -C stmhal CC=gcc-4.7
- make -C unix-cpy CC=gcc-4.7
- make -C unix CC=gcc-4.7
- cd tests && MICROPY_CPYTHON3=python3.3 ./run-tests
after_failure: for exp in *.exp; do testbase=$(basename $exp .exp); echo -e "\nFAILURE $testbase"; diff $testbase.exp $testbase.out; done
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment