diff options
| author | Andrew Scheller <github@loowis.durge.org> | 2014-04-15 03:48:58 +0100 |
|---|---|---|
| committer | Andrew Scheller <github@loowis.durge.org> | 2014-04-15 03:48:58 +0100 |
| commit | 499d50be9865b4e8829cae29c9999473fd60e795 (patch) | |
| tree | b0bc0fdc1649e13f4b5cbfab85ad36844d56cb1e | |
| parent | 16fecc0a8470087dae1c7c7c8079382996fd7d00 (diff) | |
| parent | 8c1bec4ae75d4d042a6fdeda00f7e1e495ed14e9 (diff) | |
| download | micropython-499d50be9865b4e8829cae29c9999473fd60e795.tar.gz micropython-499d50be9865b4e8829cae29c9999473fd60e795.zip | |
Merge remote-tracking branch 'upstream/master' into patch-1
Conflicts:
.travis.yml
| -rw-r--r-- | .travis.yml | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 4449d455af..33d4ee5554 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 |