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

lurch · lurch · commit 499d50be9865 · 2014-04-15T03:48:58.000+01:00
Conflicts:
	.travis.yml
diff --git 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
