Skip to content

Fix make check on win32 #10472

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 5 commits into from
Nov 14, 2013
Merged
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
2 changes: 1 addition & 1 deletion doc/tutorial-ffi.md
Original file line number Diff line number Diff line change
@@ -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;
}
~~~~

2 changes: 1 addition & 1 deletion src/librustpkg/lib.rs
Original file line number Diff line number Diff line change
@@ -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;
1 change: 1 addition & 0 deletions src/libstd/io/process.rs
Original file line number Diff line number Diff line change
@@ -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.
Original file line number Diff line number Diff line change
@@ -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)];
1 change: 1 addition & 0 deletions src/test/debug-info/var-captured-in-nested-closure.rs
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion src/test/run-pass/deriving-global.rs
Original file line number Diff line number Diff line change
@@ -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
29 changes: 0 additions & 29 deletions src/test/run-pass/extern-pass-TwoU64s-ref.rs

This file was deleted.

5 changes: 1 addition & 4 deletions src/test/run-pass/extern-pass-TwoU64s.rs
Original file line number Diff line number Diff line change
@@ -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 {
2 changes: 1 addition & 1 deletion src/test/run-pass/extern-return-TwoU64s.rs
Original file line number Diff line number Diff line change
@@ -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
File renamed without changes.
3 changes: 2 additions & 1 deletion src/test/run-pass/glob-std.rs
Original file line number Diff line number Diff line change
@@ -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;

2 changes: 1 addition & 1 deletion src/test/run-pass/issue-4208.rs
Original file line number Diff line number Diff line change
@@ -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};
2 changes: 1 addition & 1 deletion src/test/run-pass/issue-4545.rs
Original file line number Diff line number Diff line change
@@ -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");
2 changes: 1 addition & 1 deletion src/test/run-pass/issue-8044.rs
Original file line number Diff line number Diff line change
@@ -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");
2 changes: 1 addition & 1 deletion src/test/run-pass/issue-9123.rs
Original file line number Diff line number Diff line change
@@ -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;
2 changes: 1 addition & 1 deletion src/test/run-pass/issue-9188.rs
Original file line number Diff line number Diff line change
@@ -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;

2 changes: 1 addition & 1 deletion src/test/run-pass/issue-9906.rs
Original file line number Diff line number Diff line change
@@ -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");
2 changes: 1 addition & 1 deletion src/test/run-pass/issue-9968.rs
Original file line number Diff line number Diff line change
@@ -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");
2 changes: 1 addition & 1 deletion src/test/run-pass/issue_9155.rs
Original file line number Diff line number Diff line change
@@ -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;

6 changes: 3 additions & 3 deletions src/test/run-pass/linkage-visibility.rs
Original file line number Diff line number Diff line change
@@ -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");

2 changes: 1 addition & 1 deletion src/test/run-pass/logging_before_rt_started.rs
Original file line number Diff line number Diff line change
@@ -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,
2 changes: 1 addition & 1 deletion src/test/run-pass/macro-with-attrs1.rs
Original file line number Diff line number Diff line change
@@ -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)];
2 changes: 1 addition & 1 deletion src/test/run-pass/reexport-should-still-link.rs
Original file line number Diff line number Diff line change
@@ -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");

2 changes: 1 addition & 1 deletion src/test/run-pass/rt-run-twice.rs
Original file line number Diff line number Diff line change
@@ -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;

6 changes: 4 additions & 2 deletions src/test/run-pass/signal-exit-status.rs
Original file line number Diff line number Diff line change
@@ -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)
}
}
2 changes: 1 addition & 1 deletion src/test/run-pass/smallest-hello-world.rs
Original file line number Diff line number Diff line change
@@ -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

2 changes: 1 addition & 1 deletion src/test/run-pass/struct-return.rs
Original file line number Diff line number Diff line change
@@ -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 }
3 changes: 2 additions & 1 deletion src/test/run-pass/tempfile.rs
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion src/test/run-pass/typeid-intrinsic.rs
Original file line number Diff line number Diff line change
@@ -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

2 changes: 1 addition & 1 deletion src/test/run-pass/xcrate-address-insignificant.rs
Original file line number Diff line number Diff line change
@@ -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");