Skip to content

Commit 2a8a191

Browse files
authored
Rollup merge of #134777 - saethlin:enable-more-tests-on-windows, r=Noratrieb
Enable more tests on Windows As part of the discussion of rust-lang/compiler-team#822 on Zulip, it was mentioned that problems with the i686-pc-windows-gnu target may have resulted in tests being disabled on Windows. So in this PR, I've ripped out all our `//@ ignore-windows` directives, then re-added all the ones that are definitely required based on the outcome of try-builds, and in some cases I've improved the justification or tightened the directives to `//@ ignore-msvc` or ignoring specific targets.
2 parents 8a8b464 + 7dfc786 commit 2a8a191

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+41
-63
lines changed

tests/codegen/debug-column.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Verify that debuginfo column numbers are 1-based byte offsets.
22
//
3-
//@ ignore-windows
3+
//@ ignore-msvc
44
//@ compile-flags: -C debuginfo=2
55

66
#[rustfmt::skip]

tests/codegen/force-no-unwind-tables.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//@ compile-flags: -C no-prepopulate-passes -C panic=abort -C force-unwind-tables=n
2-
//@ ignore-windows
2+
//@ ignore-windows: unwind tables are required for panics on Windows
33

44
#![crate_type = "lib"]
55

tests/codegen/thread-local.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//@ compile-flags: -O
22
//@ aux-build:thread_local_aux.rs
3-
//@ ignore-windows FIXME(#84933)
3+
//@ ignore-windows FIXME(#134939)
44
//@ ignore-wasm globals are used instead of thread locals
55
//@ ignore-emscripten globals are used instead of thread locals
66
//@ ignore-android does not use #[thread_local]

tests/crashes/132981.rs

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
//@compile-flags: -Clink-dead-code=true --crate-type lib
33
//@ only-x86_64
44
//@ ignore-windows
5+
// The set of targets this crashes on is really fiddly, because it is deep in our ABI logic. It
6+
// crashes on x86_64-unknown-linux-gnu, and i686-pc-windows-msvc, but not on
7+
// x86_64-pc-windows-msvc. If you are trying to fix this crash, don't pay too much attention to the
8+
// directives.
59

610
#![feature(rust_cold_cc)]
711
pub extern "rust-cold" fn foo(_: [usize; 3]) {}

tests/rustdoc-ui/doctest/relative-path-include-bytes-132203.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//@ ignore-windows
1+
//@ ignore-windows different error message
22
//@ revisions: edition2015 edition2024
33
//@[edition2015]edition:2015
44
//@[edition2015]check-fail

tests/ui-fulldeps/stable-mir/check_abi.rs

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
//@ ignore-stage1
55
//@ ignore-cross-compile
66
//@ ignore-remote
7-
//@ ignore-windows-gnu mingw has troubles with linking https://github.com/rust-lang/rust/pull/116837
87

98
#![feature(rustc_private)]
109
#![feature(assert_matches)]

tests/ui-fulldeps/stable-mir/check_allocation.rs

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
//@ ignore-stage1
66
//@ ignore-cross-compile
77
//@ ignore-remote
8-
//@ ignore-windows-gnu mingw has troubles with linking https://github.com/rust-lang/rust/pull/116837
98
//@ edition: 2021
109

1110
#![feature(rustc_private)]

tests/ui-fulldeps/stable-mir/check_attribute.rs

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
//@ ignore-stage1
55
//@ ignore-cross-compile
66
//@ ignore-remote
7-
//@ ignore-windows-gnu mingw has troubles with linking https://github.com/rust-lang/rust/pull/116837
87

98
#![feature(rustc_private)]
109

tests/ui-fulldeps/stable-mir/check_binop.rs

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
//@ ignore-stage1
55
//@ ignore-cross-compile
66
//@ ignore-remote
7-
//@ ignore-windows-gnu mingw has troubles with linking https://github.com/rust-lang/rust/pull/116837
87

98
#![feature(rustc_private)]
109

tests/ui-fulldeps/stable-mir/check_crate_defs.rs

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
//@ ignore-stage1
55
//@ ignore-cross-compile
66
//@ ignore-remote
7-
//@ ignore-windows-gnu mingw has troubles with linking https://github.com/rust-lang/rust/pull/116837
87

98
#![feature(rustc_private)]
109
#![feature(assert_matches)]

tests/ui-fulldeps/stable-mir/check_def_ty.rs

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
//@ ignore-stage1
66
//@ ignore-cross-compile
77
//@ ignore-remote
8-
//@ ignore-windows-gnu mingw has troubles with linking https://github.com/rust-lang/rust/pull/116837
98
//@ edition: 2021
109

1110
#![feature(rustc_private)]

tests/ui-fulldeps/stable-mir/check_defs.rs

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
//@ ignore-stage1
55
//@ ignore-cross-compile
66
//@ ignore-remote
7-
//@ ignore-windows-gnu mingw has troubles with linking https://github.com/rust-lang/rust/pull/116837
87
//@ edition: 2021
98

109
#![feature(rustc_private)]

tests/ui-fulldeps/stable-mir/check_foreign.rs

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
//@ ignore-stage1
55
//@ ignore-cross-compile
66
//@ ignore-remote
7-
//@ ignore-windows-gnu mingw has troubles with linking https://github.com/rust-lang/rust/pull/116837
87
//@ edition: 2021
98

109
#![feature(rustc_private)]

tests/ui-fulldeps/stable-mir/check_instance.rs

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
//@ ignore-stage1
55
//@ ignore-cross-compile
66
//@ ignore-remote
7-
//@ ignore-windows-gnu mingw has troubles with linking https://github.com/rust-lang/rust/pull/116837
87
//@ edition: 2021
98

109
#![feature(rustc_private)]

tests/ui-fulldeps/stable-mir/check_intrinsics.rs

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
//@ ignore-stage1
99
//@ ignore-cross-compile
1010
//@ ignore-remote
11-
//@ ignore-windows-gnu mingw has troubles with linking https://github.com/rust-lang/rust/pull/116837
1211

1312
#![feature(rustc_private)]
1413
#![feature(assert_matches)]

tests/ui-fulldeps/stable-mir/check_item_kind.rs

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
//@ ignore-stage1
55
//@ ignore-cross-compile
66
//@ ignore-remote
7-
//@ ignore-windows-gnu mingw has troubles with linking https://github.com/rust-lang/rust/pull/116837
87
//@ edition: 2021
98

109
#![feature(rustc_private)]

tests/ui-fulldeps/stable-mir/check_normalization.rs

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
//@ ignore-stage1
55
//@ ignore-cross-compile
66
//@ ignore-remote
7-
//@ ignore-windows-gnu mingw has troubles with linking https://github.com/rust-lang/rust/pull/116837
87
//@ edition: 2021
98

109
#![feature(rustc_private)]

tests/ui-fulldeps/stable-mir/check_trait_queries.rs

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
//@ ignore-stage1
55
//@ ignore-cross-compile
66
//@ ignore-remote
7-
//@ ignore-windows-gnu mingw has troubles with linking https://github.com/rust-lang/rust/pull/116837
87
//@ edition: 2021
98

109
#![feature(rustc_private)]

tests/ui-fulldeps/stable-mir/check_transform.rs

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
//@ ignore-stage1
55
//@ ignore-cross-compile
66
//@ ignore-remote
7-
//@ ignore-windows-gnu mingw has troubles with linking https://github.com/rust-lang/rust/pull/116837
87

98
#![feature(rustc_private)]
109
#![feature(assert_matches)]

tests/ui-fulldeps/stable-mir/check_ty_fold.rs

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
//@ ignore-stage1
66
//@ ignore-cross-compile
77
//@ ignore-remote
8-
//@ ignore-windows-gnu mingw has troubles with linking https://github.com/rust-lang/rust/pull/116837
98
//@ edition: 2021
109

1110
#![feature(rustc_private)]

tests/ui-fulldeps/stable-mir/compilation-result.rs

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
//@ ignore-stage1
55
//@ ignore-cross-compile
66
//@ ignore-remote
7-
//@ ignore-windows-gnu mingw has troubles with linking https://github.com/rust-lang/rust/pull/116837
87
//@ edition: 2021
98

109
#![feature(rustc_private)]

tests/ui-fulldeps/stable-mir/crate-info.rs

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
//@ ignore-stage1
55
//@ ignore-cross-compile
66
//@ ignore-remote
7-
//@ ignore-windows-gnu mingw has troubles with linking https://github.com/rust-lang/rust/pull/116837
87
//@ edition: 2021
98

109
#![feature(rustc_private)]

tests/ui-fulldeps/stable-mir/projections.rs

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
//@ ignore-stage1
55
//@ ignore-cross-compile
66
//@ ignore-remote
7-
//@ ignore-windows-gnu mingw has troubles with linking https://github.com/rust-lang/rust/pull/116837
87
//@ edition: 2021
98

109
#![feature(rustc_private)]

tests/ui-fulldeps/stable-mir/smir_internal.rs

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
//@ ignore-stage1
66
//@ ignore-cross-compile
77
//@ ignore-remote
8-
//@ ignore-windows-gnu mingw has troubles with linking https://github.com/rust-lang/rust/pull/116837
98
//@ edition: 2021
109

1110
#![feature(rustc_private)]

tests/ui-fulldeps/stable-mir/smir_serde.rs

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
//@ ignore-stage1
55
//@ ignore-cross-compile
66
//@ ignore-remote
7-
//@ ignore-windows-gnu mingw has troubles with linking https://github.com/rust-lang/rust/pull/116837
87
//@ edition: 2021
98

109
#![feature(rustc_private)]

tests/ui-fulldeps/stable-mir/smir_visitor.rs

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
//@ ignore-stage1
55
//@ ignore-cross-compile
66
//@ ignore-remote
7-
//@ ignore-windows-gnu mingw has troubles with linking https://github.com/rust-lang/rust/pull/116837
87
//@ edition: 2021
98

109
#![feature(rustc_private)]

tests/ui/abi/abi-sysv64-arg-passing.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@
2929
//@ ignore-aarch64
3030
//@ ignore-windows
3131

32-
// note: windows is ignored as rust_test_helpers does not have the sysv64 abi on windows
32+
// Windows is ignored because bootstrap doesn't yet know to compile rust_test_helpers with
33+
// the sysv64 ABI on Windows.
3334

3435
#[allow(dead_code)]
3536
#[allow(improper_ctypes)]

tests/ui/abi/large-byval-align.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
//@ compile-flags: -Copt-level=0
22
//@ only-x86_64
3-
//@ ignore-windows
43
//@ min-llvm-version: 19
54
//@ build-pass
65

tests/ui/feature-gates/feature-gate-cfg-target-thread-local.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//@ ignore-windows
1+
//@ ignore-windows FIXME(134939): thread_local + no_mangle doesn't work on Windows
22
//@ aux-build:cfg-target-thread-local.rs
33

44
#![feature(thread_local)]

tests/ui/inference/issue-71584.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//@ ignore-windows different list of satisfying impls
1+
//@ ignore-windows FIXME: We get an extra E0283 on Windows
22
fn main() {
33
let n: u32 = 1;
44
let mut d: u64 = 2;

tests/ui/linkage-attr/linkage-attr-does-not-panic-llvm-issue-33992.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
//@ run-pass
2-
//@ ignore-windows
32
//@ ignore-apple
43
//@ ignore-wasm32 common linkage not implemented right now
54

@@ -11,9 +10,11 @@ pub static TEST2: bool = true;
1110
#[linkage = "internal"]
1211
pub static TEST3: bool = true;
1312

13+
#[cfg(not(target_env = "msvc"))]
1414
#[linkage = "linkonce"]
1515
pub static TEST4: bool = true;
1616

17+
#[cfg(not(target_env = "msvc"))]
1718
#[linkage = "linkonce_odr"]
1819
pub static TEST5: bool = true;
1920

tests/ui/linkage-attr/propagate-generic-issue-18804/main.rs

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// functions. Failure results in a linker error.
44

55
//@ ignore-emscripten no weak symbol support
6-
//@ ignore-windows no extern_weak linkage
76
//@ ignore-apple no extern_weak linkage
87

98
//@ aux-build:lib.rs

tests/ui/logging-only-prints-once.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
//@ run-pass
2-
//@ ignore-windows
32
//@ needs-threads
43

54
use std::cell::Cell;

tests/ui/lto/weak-works.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
//@ run-pass
22

33
//@ compile-flags: -C codegen-units=8 -Z thinlto
4-
//@ ignore-windows
4+
//@ ignore-i686-pc-windows-gnu
5+
//@ ignore-x86_64-pc-windows-gnu
56

67
#![feature(linkage)]
78

tests/ui/parser/mod_file_not_exist.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
//@ ignore-windows
2-
31
mod not_a_real_file; //~ ERROR file not found for module `not_a_real_file`
42
//~^ HELP to create the module `not_a_real_file`, create file
53

tests/ui/parser/mod_file_not_exist.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0583]: file not found for module `not_a_real_file`
2-
--> $DIR/mod_file_not_exist.rs:3:1
2+
--> $DIR/mod_file_not_exist.rs:1:1
33
|
44
LL | mod not_a_real_file;
55
| ^^^^^^^^^^^^^^^^^^^^
@@ -8,7 +8,7 @@ LL | mod not_a_real_file;
88
= note: if there is a `mod not_a_real_file` elsewhere in the crate already, import it with `use crate::...` instead
99

1010
error[E0433]: failed to resolve: use of unresolved module or unlinked crate `mod_file_aux`
11-
--> $DIR/mod_file_not_exist.rs:7:16
11+
--> $DIR/mod_file_not_exist.rs:5:16
1212
|
1313
LL | assert_eq!(mod_file_aux::bar(), 10);
1414
| ^^^^^^^^^^^^ use of unresolved module or unlinked crate `mod_file_aux`

tests/ui/suggestions/missing-lifetime-specifier.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// The specific errors produced depend the thread-local implementation.
22
// Run only on platforms with "fast" TLS.
3-
//@ ignore-windows FIXME(#84933)
43
//@ ignore-wasm globals are used instead of thread locals
54
//@ ignore-emscripten globals are used instead of thread locals
65
//@ ignore-android does not use #[thread_local]

tests/ui/suggestions/missing-lifetime-specifier.stderr

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0106]: missing lifetime specifiers
2-
--> $DIR/missing-lifetime-specifier.rs:28:44
2+
--> $DIR/missing-lifetime-specifier.rs:27:44
33
|
44
LL | static a: RefCell<HashMap<i32, Vec<Vec<Foo>>>> = RefCell::new(HashMap::new());
55
| ^^^ expected 2 lifetime parameters
@@ -11,7 +11,7 @@ LL | static a: RefCell<HashMap<i32, Vec<Vec<Foo<'static, 'static>>>>> = RefC
1111
| ++++++++++++++++++
1212

1313
error[E0106]: missing lifetime specifiers
14-
--> $DIR/missing-lifetime-specifier.rs:32:44
14+
--> $DIR/missing-lifetime-specifier.rs:31:44
1515
|
1616
LL | static b: RefCell<HashMap<i32, Vec<Vec<&Bar>>>> = RefCell::new(HashMap::new());
1717
| ^^^^ expected 2 lifetime parameters
@@ -25,7 +25,7 @@ LL | static b: RefCell<HashMap<i32, Vec<Vec<&'static Bar<'static, 'static>>>
2525
| +++++++ ++++++++++++++++++
2626

2727
error[E0106]: missing lifetime specifiers
28-
--> $DIR/missing-lifetime-specifier.rs:36:47
28+
--> $DIR/missing-lifetime-specifier.rs:35:47
2929
|
3030
LL | static c: RefCell<HashMap<i32, Vec<Vec<Qux<i32>>>>> = RefCell::new(HashMap::new());
3131
| ^ expected 2 lifetime parameters
@@ -37,7 +37,7 @@ LL | static c: RefCell<HashMap<i32, Vec<Vec<Qux<'static, 'static, i32>>>>> =
3737
| +++++++++++++++++
3838

3939
error[E0106]: missing lifetime specifiers
40-
--> $DIR/missing-lifetime-specifier.rs:40:44
40+
--> $DIR/missing-lifetime-specifier.rs:39:44
4141
|
4242
LL | static d: RefCell<HashMap<i32, Vec<Vec<&Tar<i32>>>>> = RefCell::new(HashMap::new());
4343
| ^ ^ expected 2 lifetime parameters
@@ -51,7 +51,7 @@ LL | static d: RefCell<HashMap<i32, Vec<Vec<&'static Tar<'static, 'static, i
5151
| +++++++ +++++++++++++++++
5252

5353
error[E0106]: missing lifetime specifier
54-
--> $DIR/missing-lifetime-specifier.rs:49:44
54+
--> $DIR/missing-lifetime-specifier.rs:48:44
5555
|
5656
LL | static f: RefCell<HashMap<i32, Vec<Vec<&Tar<'static, i32>>>>> = RefCell::new(HashMap::new());
5757
| ^ expected named lifetime parameter
@@ -63,15 +63,15 @@ LL | static f: RefCell<HashMap<i32, Vec<Vec<&'static Tar<'static, i32>>>>> =
6363
| +++++++
6464

6565
error[E0107]: union takes 2 lifetime arguments but 1 lifetime argument was supplied
66-
--> $DIR/missing-lifetime-specifier.rs:45:44
66+
--> $DIR/missing-lifetime-specifier.rs:44:44
6767
|
6868
LL | static e: RefCell<HashMap<i32, Vec<Vec<Qux<'static, i32>>>>> = RefCell::new(HashMap::new());
6969
| ^^^ ------- supplied 1 lifetime argument
7070
| |
7171
| expected 2 lifetime arguments
7272
|
7373
note: union defined here, with 2 lifetime parameters: `'t`, `'k`
74-
--> $DIR/missing-lifetime-specifier.rs:21:11
74+
--> $DIR/missing-lifetime-specifier.rs:20:11
7575
|
7676
LL | pub union Qux<'t, 'k, I> {
7777
| ^^^ -- --
@@ -81,15 +81,15 @@ LL | static e: RefCell<HashMap<i32, Vec<Vec<Qux<'static, 'static, i32>>>>> =
8181
| +++++++++
8282

8383
error[E0107]: trait takes 2 lifetime arguments but 1 lifetime argument was supplied
84-
--> $DIR/missing-lifetime-specifier.rs:49:45
84+
--> $DIR/missing-lifetime-specifier.rs:48:45
8585
|
8686
LL | static f: RefCell<HashMap<i32, Vec<Vec<&Tar<'static, i32>>>>> = RefCell::new(HashMap::new());
8787
| ^^^ ------- supplied 1 lifetime argument
8888
| |
8989
| expected 2 lifetime arguments
9090
|
9191
note: trait defined here, with 2 lifetime parameters: `'t`, `'k`
92-
--> $DIR/missing-lifetime-specifier.rs:25:7
92+
--> $DIR/missing-lifetime-specifier.rs:24:7
9393
|
9494
LL | trait Tar<'t, 'k, I> {}
9595
| ^^^ -- --

tests/ui/threads-sendsync/spawning-with-debug.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
//@ run-pass
22
#![allow(unused_must_use)]
33
#![allow(unused_mut)]
4-
//@ ignore-windows
54
//@ exec-env:RUST_LOG=debug
65
//@ needs-threads
76

0 commit comments

Comments
 (0)