From 974ba28add7fd43f94f5aac876777b2bc3a8092b Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Wed, 10 Feb 2016 20:21:56 +0100
Subject: [PATCH] More emscripten test fixes

---
 src/test/run-pass/allocator-default.rs        | 4 ++--
 src/test/run-pass/allocator-jemalloc.rs       | 1 +
 src/test/run-pass/asm-concat-src.rs           | 2 ++
 src/test/run-pass/conditional-compile-arch.rs | 3 +++
 src/test/run-pass/env-funky-keys.rs           | 1 +
 src/test/run-pass/out-of-stack.rs             | 1 +
 6 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/test/run-pass/allocator-default.rs b/src/test/run-pass/allocator-default.rs
index aed7e5a8c13..be69a4eaddf 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(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() {
diff --git a/src/test/run-pass/allocator-jemalloc.rs b/src/test/run-pass/allocator-jemalloc.rs
index 3744aafdc5b..ad1438f75fc 100644
--- a/src/test/run-pass/allocator-jemalloc.rs
+++ b/src/test/run-pass/allocator-jemalloc.rs
@@ -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)]
 
diff --git a/src/test/run-pass/asm-concat-src.rs b/src/test/run-pass/asm-concat-src.rs
index 716c3d47a03..ea3d0c3aa0e 100644
--- a/src/test/run-pass/asm-concat-src.rs
+++ b/src/test/run-pass/asm-concat-src.rs
@@ -9,9 +9,11 @@
 // except according to those terms.
 
 // pretty-expanded FIXME #23616
+// ignore-asmjs
 
 #![feature(asm)]
 
 pub fn main() {
     unsafe { asm!(concat!("", "")) };
 }
+
diff --git a/src/test/run-pass/conditional-compile-arch.rs b/src/test/run-pass/conditional-compile-arch.rs
index 462be5807cf..44971e9252e 100644
--- a/src/test/run-pass/conditional-compile-arch.rs
+++ b/src/test/run-pass/conditional-compile-arch.rs
@@ -24,3 +24,6 @@ pub fn main() { }
 
 #[cfg(target_arch = "powerpc64")]
 pub fn main() { }
+
+#[cfg(target_arch = "asmjs")]
+pub fn main() { }
diff --git a/src/test/run-pass/env-funky-keys.rs b/src/test/run-pass/env-funky-keys.rs
index 4d68a4445bb..2b0a0149671 100644
--- a/src/test/run-pass/env-funky-keys.rs
+++ b/src/test/run-pass/env-funky-keys.rs
@@ -12,6 +12,7 @@
 
 // ignore-android
 // ignore-windows
+// ignore-emscripten
 // no-prefer-dynamic
 
 #![feature(convert)]
diff --git a/src/test/run-pass/out-of-stack.rs b/src/test/run-pass/out-of-stack.rs
index 4401861a163..5ac03783185 100644
--- a/src/test/run-pass/out-of-stack.rs
+++ b/src/test/run-pass/out-of-stack.rs
@@ -10,6 +10,7 @@
 
 // ignore-android: FIXME (#20004)
 // ignore-musl
+// ignore-asmjs
 
 #![feature(asm)]
 #![feature(libc)]