diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-10-02 15:45:16 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-10-02 21:02:36 -0700 |
| commit | d911936dbdc645133ad9605f45d2bf10b73e2b20 (patch) | |
| tree | 891acff8f9158a69e1884707ca3bfb70d749db2e | |
| parent | f96ee10e888bac4435973972f1799db509b3318e (diff) | |
| parent | 9ac804ecabe3800a16941691bb1eb90293fd2606 (diff) | |
| download | rust-d911936dbdc645133ad9605f45d2bf10b73e2b20.tar.gz rust-d911936dbdc645133ad9605f45d2bf10b73e2b20.zip | |
Merge branch 'travis' into rollup
Conflicts: .travis.yml
| -rw-r--r-- | .travis.yml | 7 | ||||
| -rw-r--r-- | src/test/run-pass/unix-process-spawn-errno.rs | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index 354cb969edd..5bcdafb30eb 100644 --- a/.travis.yml +++ b/.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 diff --git a/src/test/run-pass/unix-process-spawn-errno.rs b/src/test/run-pass/unix-process-spawn-errno.rs index 555bf2cd4c0..42b78e4ec66 100644 --- a/src/test/run-pass/unix-process-spawn-errno.rs +++ b/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)] |