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 | |
| 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')
| m--------- | src/jemalloc | 0 | ||||
| -rw-r--r-- | src/test/compile-fail/allocator-dylib-is-system.rs | 2 | ||||
| -rw-r--r-- | src/test/compile-fail/allocator-rust-dylib-is-jemalloc.rs | 2 | ||||
| -rw-r--r-- | src/test/run-pass/allocator-default.rs | 4 | ||||
| -rw-r--r-- | src/test/run-pass/allocator-jemalloc.rs | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/jemalloc b/src/jemalloc -Subproject f84e30927284b0c500ed3eaf09e8e159da20dda +Subproject e24a1a025a1f214e40eedafe3b9c7b1d6993792 diff --git a/src/test/compile-fail/allocator-dylib-is-system.rs b/src/test/compile-fail/allocator-dylib-is-system.rs index b862fc1a1f4..5f8948ac5f1 100644 --- a/src/test/compile-fail/allocator-dylib-is-system.rs +++ b/src/test/compile-fail/allocator-dylib-is-system.rs @@ -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 diff --git a/src/test/compile-fail/allocator-rust-dylib-is-jemalloc.rs b/src/test/compile-fail/allocator-rust-dylib-is-jemalloc.rs index e75cb2a75cf..b29797f3295 100644 --- a/src/test/compile-fail/allocator-rust-dylib-is-jemalloc.rs +++ b/src/test/compile-fail/allocator-rust-dylib-is-jemalloc.rs @@ -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 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() { diff --git a/src/test/run-pass/allocator-jemalloc.rs b/src/test/run-pass/allocator-jemalloc.rs index c8a9aeb706e..3744aafdc5b 100644 --- a/src/test/run-pass/allocator-jemalloc.rs +++ b/src/test/run-pass/allocator-jemalloc.rs @@ -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 |