about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-02-11 16:49:20 +0000
committerbors <bors@rust-lang.org>2016-02-11 16:49:20 +0000
commitaa1dc0975a43e224386ec0ed1bb7ae09cfd0dd7e (patch)
tree13d6901dcf2b6b97b5d50352f70089f6c44a9c67 /src/test
parenta91ff1c9d1842918329ef7a81afd3848854d53c7 (diff)
parent657f1cf0e0c4302827f24084dd1822385944f5ef (diff)
downloadrust-aa1dc0975a43e224386ec0ed1bb7ae09cfd0dd7e.tar.gz
rust-aa1dc0975a43e224386ec0ed1bb7ae09cfd0dd7e.zip
Auto merge of #31532 - tomaka:fix-emscripten, r=brson
Before this PR:

> test result: FAILED. 2039 passed; 327 failed; 2 ignored; 0 measured

After:

> test result: FAILED. 2232 passed; 134 failed; 2 ignored; 0 measured

r? @brson
Diffstat (limited to 'src/test')
-rw-r--r--src/test/run-pass/x86stdcall.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/test/run-pass/x86stdcall.rs b/src/test/run-pass/x86stdcall.rs
index c8c96b299fa..106bf8ce7df 100644
--- a/src/test/run-pass/x86stdcall.rs
+++ b/src/test/run-pass/x86stdcall.rs
@@ -38,5 +38,6 @@ pub fn main() {
           target_os = "netbsd",
           target_os = "openbsd",
           target_os = "android",
-          target_os = "solaris"))]
+          target_os = "solaris",
+          target_os = "emscripten"))]
 pub fn main() { }