Skip to content

Commit

Permalink
test: Clean up xfail-{fast,win32} tests
Browse files Browse the repository at this point in the history
Rename {struct-update,fsu}-moves-and-copies, since win32
failed to run the test since UAC prevents any executable whose
name contaning "update". (rust-lang#10452)

Some tests related to rust-lang#9205 are expected to fail on gcc 4.8,
so they are marked as `xfail-win32` instead of `xfail-fast`.

Some tests using `extra::tempfile` fail on win32 due to rust-lang#10462.
Mark them as `xfail-win32`.
  • Loading branch information
klutzy committed Nov 14, 2013
1 parent 58b5c61 commit fcf9844
Show file tree
Hide file tree
Showing 24 changed files with 26 additions and 56 deletions.
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
Expand Down
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
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/test/run-pass/extern-return-TwoU64s.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
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
Expand Up @@ -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;

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

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

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

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

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

Expand Down
2 changes: 1 addition & 1 deletion src/test/run-pass/smallest-hello-world.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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

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

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

0 comments on commit fcf9844

Please sign in to comment.