auto merge of #10472 : klutzy/rust/cleanup-xfail, r=alexcrichton

Closes #10452.

Author: bors

doc/tutorial-ffi.md

@@ -303,7 +303,7 @@ conventions. Rust provides a way to tell the compiler which convention to use:
 #[cfg(target_os = "win32", target_arch = "x86")]
 #[link_name = "kernel32"]
 extern "stdcall" {
-    fn SetEnvironmentVariableA(n: *u8, v: *u8) -> int;
+    fn SetEnvironmentVariableA(n: *u8, v: *u8) -> std::libc::c_int;
 }
 ~~~~
 

src/librustpkg/lib.rs

@@ -70,7 +70,7 @@ mod search;
 mod sha1;
 mod source_control;
 mod target;
-#[cfg(test)]
+#[cfg(not(windows), test)] // FIXME test failure on windows: #10471
 mod tests;
 mod util;
 pub mod version;

src/libstd/io/process.rs

@@ -82,6 +82,7 @@ pub enum StdioContainer {
 }
 
 /// Describes the result of a process after it has terminated.
+/// Note that Windows have no signals, so the result is usually ExitStatus.
 #[deriving(Eq)]
 pub enum ProcessExit {
     /// Normal termination with an exit status.

src/test/debug-info/by-value-self-argument-in-trait-impl.rs

@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// xfail-win32: FIXME (#10474)
 // xfail-android: FIXME(#10381)
 
 #[feature(managed_boxes)];

src/test/debug-info/var-captured-in-nested-closure.rs

@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// xfail-win32: FIXME #10474
 // xfail-android: FIXME(#10381)
 
 // compile-flags:-Z extra-debug-info

src/test/run-pass/deriving-global.rs

@@ -1,4 +1,4 @@
-// xfail-fast #7103 `extern mod` does not work on windows
+// xfail-fast #7103 `extern mod` does not work on check-fast
 // xfail-pretty - does not converge
 
 // Copyright 2013 The Rust Project Developers. See the COPYRIGHT

src/test/run-pass/extern-pass-TwoU64s-ref.rs

@@ -11,10 +11,7 @@
 // Test a foreign function that accepts and returns a struct
 // by value.
 
-// xfail-fast This works standalone on windows but not with check-fast.
-// possibly because there is another test that uses this extern fn but gives it
-// a different signature
-// xfail-fast #9205
+// xfail-win32 #9205
 
 #[deriving(Eq)]
 struct TwoU64s {

src/test/run-pass/extern-pass-TwoU64s.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-fast #9205
+// xfail-win32 #9205
 
 struct TwoU64s {
     one: u64, two: u64

src/test/run-pass/extern-return-TwoU64s.rs

@@ -8,7 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-fast windows doesn't like 'extern mod extra'
+// xfail-fast check-fast doesn't like 'extern mod extra'
+// xfail-win32 TempDir may cause IoError on windows: #10462
 
 extern mod extra;
 

src/test/run-pass/struct-update-moves-and-copies.rs src/test/run-pass/fsu-moves-and-copies.rs

@@ -9,7 +9,7 @@
 // except according to those terms.
 
 // aux-build:issue-4208-cc.rs
-// xfail-fast - Windows hates cross-crate tests
+// xfail-fast - check-fast hates cross-crate tests
 
 extern mod numeric;
 use numeric::{sin, Angle};

src/test/run-pass/glob-std.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-fast windows doesn't like aux-build
+// xfail-fast check-fast doesn't like aux-build
 // aux-build:issue-4545.rs
 
 extern mod somelib(name = "issue-4545");

src/test/run-pass/issue-4208.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-fast windows doesn't like aux-build
+// xfail-fast check-fast doesn't like aux-build
 // aux-build:issue-8044.rs
 
 extern mod minimal(name= "issue-8044");

src/test/run-pass/issue-4545.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-fast windows doesn't like aux-build
+// xfail-fast check-fast doesn't like aux-build
 // aux-build:issue_9123.rs
 
 extern mod issue_9123;

src/test/run-pass/issue-8044.rs

@@ -9,7 +9,7 @@
 // except according to those terms.
 
 // aux-build:issue_9188.rs
-// xfail-fast windows doesn't like aux-build
+// xfail-fast check-fast doesn't like aux-build
 
 extern mod issue_9188;
 

src/test/run-pass/issue-9123.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-fast windows doesn't like extern mod
+// xfail-fast check-fast doesn't like extern mod
 // aux-build:issue-9906.rs
 
 extern mod testmod(name = "issue-9906");

src/test/run-pass/issue-9188.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-fast windows doesn't like extern mod
+// xfail-fast check-fast doesn't like extern mod
 // aux-build:issue-9968.rs
 
 extern mod lib(name = "issue-9968");

src/test/run-pass/issue-9906.rs

@@ -9,7 +9,7 @@
 // except according to those terms.
 
 // aux-build:issue_9155.rs
-// xfail-fast windows doesn't like the aux-build
+// xfail-fast check-fast doesn't like the aux-build
 
 extern mod issue_9155;
 

src/test/run-pass/issue-9968.rs

@@ -8,10 +8,10 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-android: FIXME(#10379)
-
 // aux-build:linkage-visibility.rs
-// xfail-fast windows doesn't like aux-build
+// xfail-fast check-fast doesn't like 'extern mod'
+// xfail-android: FIXME(#10379)
+// xfail-win32: std::unstable::dynamic_lib does not work on win32 well
 
 extern mod foo(name = "linkage-visibility");
 

src/test/run-pass/issue_9155.rs

@@ -9,7 +9,7 @@
 // except according to those terms.
 
 // exec-env:RUST_LOG=std::ptr
-// xfail-fast this would cause everything to print forever on windows...
+// xfail-fast this would cause everything to print forever on check-fast...
 
 // In issue #9487, it was realized that std::ptr was invoking the logging
 // infrastructure, and when std::ptr was used during runtime initialization,

src/test/run-pass/linkage-visibility.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-fast windows doesn't like compile-flags
+// xfail-fast check-fast doesn't like compile-flags
 // compile-flags: --cfg foo
 
 #[feature(macro_rules)];

src/test/run-pass/logging_before_rt_started.rs

@@ -9,7 +9,7 @@
 // except according to those terms.
 
 // aux-build:reexport-should-still-link.rs
-// xfail-fast windows doesn't like extern mod
+// xfail-fast check-fast doesn't like extern mod
 
 extern mod foo(name = "reexport-should-still-link");
 

src/test/run-pass/macro-with-attrs1.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-fast windows uses a different test runner
+// xfail-fast make-check does not like `#[start]`
 
 use std::rt;
 

src/test/run-pass/reexport-should-still-link.rs

@@ -8,7 +8,7 @@
 // option. this file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-fast
+// xfail-fast calling itself doesn't work on check-fast
 
 use std::{os, run};
 use std::io::process;
@@ -20,8 +20,10 @@ fn main() {
         unsafe { *(0 as *mut int) = 0; }
     } else {
         let status = run::process_status(args[0], [~"signal"]);
+        // Windows does not have signal, so we get exit status 0xC0000028 (STATUS_BAD_STACK).
         match status {
-            process::ExitSignal(_) => {},
+            process::ExitSignal(_) if cfg!(unix) => {},
+            process::ExitStatus(0xC0000028) if cfg!(windows) => {},
             _ => fail!("invalid termination (was not signalled): {:?}", status)
         }
     }

src/test/run-pass/rt-run-twice.rs

@@ -9,7 +9,7 @@
 // except according to those terms.
 
 // xfail-test - FIXME(#8538) some kind of problem linking induced by extern "C" fns that I do not understand
-// xfail-fast - windows doesn't like this
+// xfail-fast - check-fast doesn't like this
 
 // Smallest hello world with no runtime
 

src/test/run-pass/signal-exit-status.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-fast #9205
+// xfail-win32 #9205
 
 pub struct Quad { a: u64, b: u64, c: u64, d: u64 }
 pub struct Floats { a: f64, b: u8, c: f64 }

src/test/run-pass/smallest-hello-world.rs

@@ -8,7 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-fast windows doesn't like 'extern mod extra'
+// xfail-fast check-fast doesn't like 'extern mod'
+// xfail-win32 TempDir may cause IoError on windows: #10463
 
 // These tests are here to exercise the functionality of the `tempfile` module.
 // One might expect these tests to be located in that module, but sadly they

src/test/run-pass/struct-return.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-fast windows doesn't like aux-build
+// xfail-fast check-fast doesn't like aux-build
 // aux-build:typeid-intrinsic.rs
 // aux-build:typeid-intrinsic2.rs
 

src/test/run-pass/tempfile.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-fast windows doesn't like aux-build
+// xfail-fast check-fast doesn't like aux-build
 // aux-build:xcrate_address_insignificant.rs
 
 extern mod foo(name = "xcrate_address_insignificant");