diff options
| author | bors <bors@rust-lang.org> | 2016-12-27 02:18:20 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-12-27 02:18:20 +0000 |
| commit | c2ee32ab45d0b78484b7e4b76e160555f121ef63 (patch) | |
| tree | 573b08c535aa29fde1ad2652641171176ea5b125 | |
| parent | 77f7c7aaf5ead9219bc0c0ace4687191fed0a05f (diff) | |
| parent | dad0076569bae914f79b7931b68d316b3fb3a875 (diff) | |
| download | rust-c2ee32ab45d0b78484b7e4b76e160555f121ef63.tar.gz rust-c2ee32ab45d0b78484b7e4b76e160555f121ef63.zip | |
Auto merge of #38507 - alexcrichton:travis-lldb, r=brson
travis: Update the OSX image we run tests in The current image is `xcode7.3`, Travis's current default. Unfortunately this has a version of LLDB which doesn't support debuginfo-lldb tests (see #32520), so we're not running LLDB tests on Travis yet. This switches us to the newest image from Travis, `xcode8.2`, which should have a newer version of LLDB we can run tests against.
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | src/test/debuginfo/union-smoke.rs | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index ea8c94af80b..3a9635a8618 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,8 @@ git: depth: 1 submodules: false +osx_image: xcode8.2 + matrix: include: # Linux builders, all docker images diff --git a/src/test/debuginfo/union-smoke.rs b/src/test/debuginfo/union-smoke.rs index 26e73a08ea1..ada9e0b30cc 100644 --- a/src/test/debuginfo/union-smoke.rs +++ b/src/test/debuginfo/union-smoke.rs @@ -9,6 +9,7 @@ // except according to those terms. // min-lldb-version: 310 +// ignore-macos FIXME(#37479) // compile-flags:-g |