From fcf9844891db2603c215aa7205ac50b5d3ba47dc Mon Sep 17 00:00:00 2001 From: klutzy Date: Wed, 13 Nov 2013 13:58:17 +0900 Subject: [PATCH] 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". (#10452) Some tests related to #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 #10462. Mark them as `xfail-win32`. --- src/test/run-pass/deriving-global.rs | 2 +- src/test/run-pass/extern-pass-TwoU64s-ref.rs | 29 ------------------- src/test/run-pass/extern-pass-TwoU64s.rs | 5 +--- src/test/run-pass/extern-return-TwoU64s.rs | 2 +- ...-and-copies.rs => fsu-moves-and-copies.rs} | 0 src/test/run-pass/glob-std.rs | 3 +- src/test/run-pass/issue-4208.rs | 2 +- src/test/run-pass/issue-4545.rs | 2 +- src/test/run-pass/issue-8044.rs | 2 +- src/test/run-pass/issue-9123.rs | 2 +- src/test/run-pass/issue-9188.rs | 2 +- src/test/run-pass/issue-9906.rs | 2 +- src/test/run-pass/issue-9968.rs | 2 +- src/test/run-pass/issue_9155.rs | 2 +- src/test/run-pass/linkage-visibility.rs | 6 ++-- .../run-pass/logging_before_rt_started.rs | 2 +- src/test/run-pass/macro-with-attrs1.rs | 2 +- .../run-pass/reexport-should-still-link.rs | 2 +- src/test/run-pass/rt-run-twice.rs | 2 +- src/test/run-pass/smallest-hello-world.rs | 2 +- src/test/run-pass/struct-return.rs | 2 +- src/test/run-pass/tempfile.rs | 3 +- src/test/run-pass/typeid-intrinsic.rs | 2 +- .../run-pass/xcrate-address-insignificant.rs | 2 +- 24 files changed, 26 insertions(+), 56 deletions(-) delete mode 100644 src/test/run-pass/extern-pass-TwoU64s-ref.rs rename src/test/run-pass/{struct-update-moves-and-copies.rs => fsu-moves-and-copies.rs} (100%) diff --git a/src/test/run-pass/deriving-global.rs b/src/test/run-pass/deriving-global.rs index 7804ce48c70..37487c1b6d7 100644 --- a/src/test/run-pass/deriving-global.rs +++ b/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 diff --git a/src/test/run-pass/extern-pass-TwoU64s-ref.rs b/src/test/run-pass/extern-pass-TwoU64s-ref.rs deleted file mode 100644 index caba29a2667..00000000000 --- a/src/test/run-pass/extern-pass-TwoU64s-ref.rs +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright 2012 The Rust Project Developers. See the COPYRIGHT -// file at the top-level directory of this distribution and at -// http://rust-lang.org/COPYRIGHT. -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - -// Test that we ignore modes when calling extern functions. -// xfail-fast #9205 - -#[deriving(Eq)] -struct TwoU64s { - one: u64, two: u64 -} - -extern { - pub fn rust_dbg_extern_identity_TwoU64s(u: TwoU64s) -> TwoU64s; -} - -pub fn main() { - unsafe { - let x = TwoU64s {one: 22, two: 23}; - let y = rust_dbg_extern_identity_TwoU64s(x); - assert_eq!(x, y); - } -} diff --git a/src/test/run-pass/extern-pass-TwoU64s.rs b/src/test/run-pass/extern-pass-TwoU64s.rs index 1b5e661ed8e..033359f85fa 100644 --- a/src/test/run-pass/extern-pass-TwoU64s.rs +++ b/src/test/run-pass/extern-pass-TwoU64s.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 { diff --git a/src/test/run-pass/extern-return-TwoU64s.rs b/src/test/run-pass/extern-return-TwoU64s.rs index a28795b93e0..b52808ea32d 100644 --- a/src/test/run-pass/extern-return-TwoU64s.rs +++ b/src/test/run-pass/extern-return-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 diff --git a/src/test/run-pass/struct-update-moves-and-copies.rs b/src/test/run-pass/fsu-moves-and-copies.rs similarity index 100% rename from src/test/run-pass/struct-update-moves-and-copies.rs rename to src/test/run-pass/fsu-moves-and-copies.rs diff --git a/src/test/run-pass/glob-std.rs b/src/test/run-pass/glob-std.rs index 8e516f748ff..655bc777193 100644 --- a/src/test/run-pass/glob-std.rs +++ b/src/test/run-pass/glob-std.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; diff --git a/src/test/run-pass/issue-4208.rs b/src/test/run-pass/issue-4208.rs index 4328dc7d5f9..92b3f6274d5 100644 --- a/src/test/run-pass/issue-4208.rs +++ b/src/test/run-pass/issue-4208.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}; diff --git a/src/test/run-pass/issue-4545.rs b/src/test/run-pass/issue-4545.rs index 834e09859f6..4b13563726e 100644 --- a/src/test/run-pass/issue-4545.rs +++ b/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-4545.rs extern mod somelib(name = "issue-4545"); diff --git a/src/test/run-pass/issue-8044.rs b/src/test/run-pass/issue-8044.rs index d8e0085ed87..300f54aa106 100644 --- a/src/test/run-pass/issue-8044.rs +++ b/src/test/run-pass/issue-8044.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"); diff --git a/src/test/run-pass/issue-9123.rs b/src/test/run-pass/issue-9123.rs index 73a14de10bf..8399eeebe48 100644 --- a/src/test/run-pass/issue-9123.rs +++ b/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 aux-build +// xfail-fast check-fast doesn't like aux-build // aux-build:issue_9123.rs extern mod issue_9123; diff --git a/src/test/run-pass/issue-9188.rs b/src/test/run-pass/issue-9188.rs index 7cfa230766c..e3e09394bd6 100644 --- a/src/test/run-pass/issue-9188.rs +++ b/src/test/run-pass/issue-9188.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; diff --git a/src/test/run-pass/issue-9906.rs b/src/test/run-pass/issue-9906.rs index 287000d2fb1..ac15fef3622 100644 --- a/src/test/run-pass/issue-9906.rs +++ b/src/test/run-pass/issue-9906.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"); diff --git a/src/test/run-pass/issue-9968.rs b/src/test/run-pass/issue-9968.rs index 70338bd0f32..ebe268cce1c 100644 --- a/src/test/run-pass/issue-9968.rs +++ b/src/test/run-pass/issue-9968.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"); diff --git a/src/test/run-pass/issue_9155.rs b/src/test/run-pass/issue_9155.rs index ba92a0c7b1f..ae0bfe2babe 100644 --- a/src/test/run-pass/issue_9155.rs +++ b/src/test/run-pass/issue_9155.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; diff --git a/src/test/run-pass/linkage-visibility.rs b/src/test/run-pass/linkage-visibility.rs index f2c6140598d..645be40250a 100644 --- a/src/test/run-pass/linkage-visibility.rs +++ b/src/test/run-pass/linkage-visibility.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"); diff --git a/src/test/run-pass/logging_before_rt_started.rs b/src/test/run-pass/logging_before_rt_started.rs index cdf38821ebe..61d48c6800d 100644 --- a/src/test/run-pass/logging_before_rt_started.rs +++ b/src/test/run-pass/logging_before_rt_started.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, diff --git a/src/test/run-pass/macro-with-attrs1.rs b/src/test/run-pass/macro-with-attrs1.rs index 1e49e4a35cc..5a5091c3856 100644 --- a/src/test/run-pass/macro-with-attrs1.rs +++ b/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 doesn't like compile-flags +// xfail-fast check-fast doesn't like compile-flags // compile-flags: --cfg foo #[feature(macro_rules)]; diff --git a/src/test/run-pass/reexport-should-still-link.rs b/src/test/run-pass/reexport-should-still-link.rs index ed5c3941c36..f2d90a2374a 100644 --- a/src/test/run-pass/reexport-should-still-link.rs +++ b/src/test/run-pass/reexport-should-still-link.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"); diff --git a/src/test/run-pass/rt-run-twice.rs b/src/test/run-pass/rt-run-twice.rs index 0bb02ed5498..a9a26c2fbb1 100644 --- a/src/test/run-pass/rt-run-twice.rs +++ b/src/test/run-pass/rt-run-twice.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; diff --git a/src/test/run-pass/smallest-hello-world.rs b/src/test/run-pass/smallest-hello-world.rs index 1e5ea7126e4..92513caf87d 100644 --- a/src/test/run-pass/smallest-hello-world.rs +++ b/src/test/run-pass/smallest-hello-world.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 diff --git a/src/test/run-pass/struct-return.rs b/src/test/run-pass/struct-return.rs index 7edaad3748a..324186021b8 100644 --- a/src/test/run-pass/struct-return.rs +++ b/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 #9205 +// xfail-win32 #9205 pub struct Quad { a: u64, b: u64, c: u64, d: u64 } pub struct Floats { a: f64, b: u8, c: f64 } diff --git a/src/test/run-pass/tempfile.rs b/src/test/run-pass/tempfile.rs index 0a2905099ef..e8e3d337838 100644 --- a/src/test/run-pass/tempfile.rs +++ b/src/test/run-pass/tempfile.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 diff --git a/src/test/run-pass/typeid-intrinsic.rs b/src/test/run-pass/typeid-intrinsic.rs index b9ad9b09d49..3fd7c05796b 100644 --- a/src/test/run-pass/typeid-intrinsic.rs +++ b/src/test/run-pass/typeid-intrinsic.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 diff --git a/src/test/run-pass/xcrate-address-insignificant.rs b/src/test/run-pass/xcrate-address-insignificant.rs index 33f958f20bc..91b8c99ca19 100644 --- a/src/test/run-pass/xcrate-address-insignificant.rs +++ b/src/test/run-pass/xcrate-address-insignificant.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"); -- GitLab