diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2016-01-17 11:06:39 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2016-01-20 09:38:16 -0800 |
| commit | 884de56f71ef60260c0d95fc5f1ca792b0dc6940 (patch) | |
| tree | 9f214aebbc0e78b6f9cb0fd0765d2e2c097ed90a /src/test/run-pass/allocator-default.rs | |
| parent | bff52927f582e2ca8dea799bd58f06e654295e21 (diff) | |
| download | rust-884de56f71ef60260c0d95fc5f1ca792b0dc6940.tar.gz rust-884de56f71ef60260c0d95fc5f1ca792b0dc6940.zip | |
Downgrade bundled jemalloc version
We've been seeing a lot of timeouts in tests on the bots and investigation ended pointing to jemalloc/jemalloc#315 as the culprit. Unfortunately it looks like that doesn't seem to have a fix on the way soon, so let's temporarily downgrade back to the previous version of jemalloc we were using (where #30434 was the most recent upgrade)
Diffstat (limited to 'src/test/run-pass/allocator-default.rs')
| -rw-r--r-- | src/test/run-pass/allocator-default.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/run-pass/allocator-default.rs b/src/test/run-pass/allocator-default.rs index 52ad8b17093..aed7e5a8c13 100644 --- a/src/test/run-pass/allocator-default.rs +++ b/src/test/run-pass/allocator-default.rs @@ -10,9 +10,9 @@ #![feature(alloc_jemalloc, alloc_system)] -#[cfg(not(any(target_env = "msvc", target_os = "bitrig", target_os = "openbsd")))] +#[cfg(not(any(windows, target_os = "bitrig", target_os = "openbsd")))] extern crate alloc_jemalloc; -#[cfg(any(target_env = "msvc", target_os = "bitrig", target_os = "openbsd"))] +#[cfg(any(windows, target_os = "bitrig", target_os = "openbsd"))] extern crate alloc_system; fn main() { |