Skip to content

Commit fcf9844

Browse files
committed
test: Clean up xfail-{fast,win32} tests
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`.
1 parent 58b5c61 commit fcf9844

24 files changed

+26
-56
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// xfail-fast #7103 `extern mod` does not work on windows
1+
// xfail-fast #7103 `extern mod` does not work on check-fast
22
// xfail-pretty - does not converge
33

44
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT

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

-29
This file was deleted.

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

+1-4
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,7 @@
1111
// Test a foreign function that accepts and returns a struct
1212
// by value.
1313

14-
// xfail-fast This works standalone on windows but not with check-fast.
15-
// possibly because there is another test that uses this extern fn but gives it
16-
// a different signature
17-
// xfail-fast #9205
14+
// xfail-win32 #9205
1815

1916
#[deriving(Eq)]
2017
struct TwoU64s {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// xfail-fast #9205
11+
// xfail-win32 #9205
1212

1313
struct TwoU64s {
1414
one: u64, two: u64

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// xfail-fast windows doesn't like 'extern mod extra'
11+
// xfail-fast check-fast doesn't like 'extern mod extra'
12+
// xfail-win32 TempDir may cause IoError on windows: #10462
1213

1314
extern mod extra;
1415

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// except according to those terms.
1010

1111
// aux-build:issue-4208-cc.rs
12-
// xfail-fast - Windows hates cross-crate tests
12+
// xfail-fast - check-fast hates cross-crate tests
1313

1414
extern mod numeric;
1515
use numeric::{sin, Angle};

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// xfail-fast windows doesn't like aux-build
11+
// xfail-fast check-fast doesn't like aux-build
1212
// aux-build:issue-4545.rs
1313

1414
extern mod somelib(name = "issue-4545");

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// xfail-fast windows doesn't like aux-build
11+
// xfail-fast check-fast doesn't like aux-build
1212
// aux-build:issue-8044.rs
1313

1414
extern mod minimal(name= "issue-8044");

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// xfail-fast windows doesn't like aux-build
11+
// xfail-fast check-fast doesn't like aux-build
1212
// aux-build:issue_9123.rs
1313

1414
extern mod issue_9123;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// except according to those terms.
1010

1111
// aux-build:issue_9188.rs
12-
// xfail-fast windows doesn't like aux-build
12+
// xfail-fast check-fast doesn't like aux-build
1313

1414
extern mod issue_9188;
1515

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// xfail-fast windows doesn't like extern mod
11+
// xfail-fast check-fast doesn't like extern mod
1212
// aux-build:issue-9906.rs
1313

1414
extern mod testmod(name = "issue-9906");

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// xfail-fast windows doesn't like extern mod
11+
// xfail-fast check-fast doesn't like extern mod
1212
// aux-build:issue-9968.rs
1313

1414
extern mod lib(name = "issue-9968");

src/test/run-pass/issue_9155.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// except according to those terms.
1010

1111
// aux-build:issue_9155.rs
12-
// xfail-fast windows doesn't like the aux-build
12+
// xfail-fast check-fast doesn't like the aux-build
1313

1414
extern mod issue_9155;
1515

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// xfail-android: FIXME(#10379)
12-
1311
// aux-build:linkage-visibility.rs
14-
// xfail-fast windows doesn't like aux-build
12+
// xfail-fast check-fast doesn't like 'extern mod'
13+
// xfail-android: FIXME(#10379)
14+
// xfail-win32: std::unstable::dynamic_lib does not work on win32 well
1515

1616
extern mod foo(name = "linkage-visibility");
1717

src/test/run-pass/logging_before_rt_started.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// except according to those terms.
1010

1111
// exec-env:RUST_LOG=std::ptr
12-
// xfail-fast this would cause everything to print forever on windows...
12+
// xfail-fast this would cause everything to print forever on check-fast...
1313

1414
// In issue #9487, it was realized that std::ptr was invoking the logging
1515
// infrastructure, and when std::ptr was used during runtime initialization,

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// xfail-fast windows doesn't like compile-flags
11+
// xfail-fast check-fast doesn't like compile-flags
1212
// compile-flags: --cfg foo
1313

1414
#[feature(macro_rules)];

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// except according to those terms.
1010

1111
// aux-build:reexport-should-still-link.rs
12-
// xfail-fast windows doesn't like extern mod
12+
// xfail-fast check-fast doesn't like extern mod
1313

1414
extern mod foo(name = "reexport-should-still-link");
1515

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// xfail-fast windows uses a different test runner
11+
// xfail-fast make-check does not like `#[start]`
1212

1313
use std::rt;
1414

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// except according to those terms.
1010

1111
// xfail-test - FIXME(#8538) some kind of problem linking induced by extern "C" fns that I do not understand
12-
// xfail-fast - windows doesn't like this
12+
// xfail-fast - check-fast doesn't like this
1313

1414
// Smallest hello world with no runtime
1515

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// xfail-fast #9205
11+
// xfail-win32 #9205
1212

1313
pub struct Quad { a: u64, b: u64, c: u64, d: u64 }
1414
pub struct Floats { a: f64, b: u8, c: f64 }

src/test/run-pass/tempfile.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// xfail-fast windows doesn't like 'extern mod extra'
11+
// xfail-fast check-fast doesn't like 'extern mod'
12+
// xfail-win32 TempDir may cause IoError on windows: #10463
1213

1314
// These tests are here to exercise the functionality of the `tempfile` module.
1415
// One might expect these tests to be located in that module, but sadly they

src/test/run-pass/typeid-intrinsic.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// xfail-fast windows doesn't like aux-build
11+
// xfail-fast check-fast doesn't like aux-build
1212
// aux-build:typeid-intrinsic.rs
1313
// aux-build:typeid-intrinsic2.rs
1414

src/test/run-pass/xcrate-address-insignificant.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// xfail-fast windows doesn't like aux-build
11+
// xfail-fast check-fast doesn't like aux-build
1212
// aux-build:xcrate_address_insignificant.rs
1313

1414
extern mod foo(name = "xcrate_address_insignificant");

0 commit comments

Comments
 (0)