Skip to content

More emscripten test fixes #31541

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 12, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/test/run-pass/allocator-default.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@

#![feature(alloc_jemalloc, alloc_system)]

#[cfg(not(any(windows, target_os = "bitrig", target_os = "openbsd")))]
#[cfg(not(any(windows, target_os = "bitrig", target_os = "openbsd", target_os="emscripten")))]
extern crate alloc_jemalloc;
#[cfg(any(windows, target_os = "bitrig", target_os = "openbsd"))]
#[cfg(any(windows, target_os = "bitrig", target_os = "openbsd", target_os="emscripten"))]
extern crate alloc_system;

fn main() {
Expand Down
1 change: 1 addition & 0 deletions src/test/run-pass/allocator-jemalloc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
// ignore-windows no jemalloc on windows
// ignore-bitrig no jemalloc on bitrig
// ignore-openbsd no jemalloc on openbsd
// ignore-emscripten no jemalloc on emscripten

#![feature(alloc_jemalloc)]

Expand Down
2 changes: 2 additions & 0 deletions src/test/run-pass/asm-concat-src.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@
// except according to those terms.

// pretty-expanded FIXME #23616
// ignore-asmjs

#![feature(asm)]

pub fn main() {
unsafe { asm!(concat!("", "")) };
}

3 changes: 3 additions & 0 deletions src/test/run-pass/conditional-compile-arch.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,6 @@ pub fn main() { }

#[cfg(target_arch = "powerpc64")]
pub fn main() { }

#[cfg(target_arch = "asmjs")]
pub fn main() { }
1 change: 1 addition & 0 deletions src/test/run-pass/env-funky-keys.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

// ignore-android
// ignore-windows
// ignore-emscripten
// no-prefer-dynamic

#![feature(convert)]
Expand Down
1 change: 1 addition & 0 deletions src/test/run-pass/out-of-stack.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

// ignore-android: FIXME (#20004)
// ignore-musl
// ignore-asmjs

#![feature(asm)]
#![feature(libc)]
Expand Down