Merge branch 'travis' into rollup

Conflicts:
	.travis.yml

.travis.yml

@@ -3,6 +3,13 @@
 # downloads a rust/cargo snapshot, which we don't really want for building rust.
 language: c
 
+# Make sure we've got an up-to-date g++ compiler to get past the LLVM configure
+# script.
+install:
+  - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
+  - sudo apt-get update -qq
+  - sudo apt-get install g++-4.7
+
 # The test suite is in general way too stressful for travis, especially in
 # terms of time limit and reliability. In the past we've tried to scale things
 # back to only build the stage1 compiler and run a subset of tests, but this

src/test/run-pass/unix-process-spawn-errno.rs

@@ -9,6 +9,7 @@
 // except according to those terms.
 
 // ignore-windows
+// ignore-macos
 
 #![feature(macro_rules)]