user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto merge of #30985 - alexcrichton:downgrade-jemaloc, r=brson

Browse source 
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)
This commit is contained in:
bors 2016-01-20 20:14:18 +00:00
commit 0b77e50b41
6 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/jemalloc

@ -1 +1 @@
Subproject commit f84e30927284b0c500ed3eaf09e8e159da20ddaf
Subproject commit e24a1a025a1f214e40eedafe3b9c7b1d69937922

2
src/test/compile-fail/allocator-dylib-is-system.rs
View file

@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// ignore-msvc everything is the system allocator on msvc
// ignore-windows everything is the system allocator on windows
// ignore-musl no dylibs on musl yet
// ignore-bitrig no jemalloc on bitrig
// ignore-openbsd no jemalloc on openbsd

2
src/test/compile-fail/allocator-rust-dylib-is-jemalloc.rs
View file

@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// ignore-msvc everything is the system allocator on msvc
// ignore-windows everything is the system allocator on windows
// ignore-musl no dylibs on musl right now
// ignore-bitrig no jemalloc on bitrig
// ignore-openbsd no jemalloc on openbsd

4
src/test/run-pass/allocator-default.rs
View file

@ -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() {

2
src/test/run-pass/allocator-jemalloc.rs
View file

@ -9,7 +9,7 @@
// except according to those terms.
// no-prefer-dynamic
// ignore-msvc no jemalloc on msvc
// ignore-windows no jemalloc on windows
// ignore-bitrig no jemalloc on bitrig
// ignore-openbsd no jemalloc on openbsd