Auto merge of #31541 - tomaka:more-emscripten, r=brson

r? @brson

Author: bors

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

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)]
 

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!("", "")) };
 }
+

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

src/test/run-pass/env-funky-keys.rs

@@ -12,6 +12,7 @@
 
 // ignore-android
 // ignore-windows
+// ignore-emscripten
 // no-prefer-dynamic
 
 #![feature(convert)]

src/test/run-pass/out-of-stack.rs

@@ -10,6 +10,7 @@
 
 // ignore-android: FIXME (#20004)
 // ignore-musl
+// ignore-asmjs
 
 #![feature(asm)]
 #![feature(libc)]