Skip to content

Commit 6e3bb3a

Browse files
committed
Auto merge of rust-lang#134777 - saethlin:enable-more-tests-on-windows, r=<try>
(mostly) blindly enable more tests on Windows r? ghost try-job: x86_64-msvc try-job: i686-msvc
2 parents dd84b7d + deb841a commit 6e3bb3a

File tree

62 files changed

+43
-103
lines changed

Some content is hidden

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

62 files changed

+43
-103
lines changed

src/ci/github-actions/jobs.yml

-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ pr:
9898
<<: *job-linux-4c
9999
- image: x86_64-gnu-llvm-18
100100
env:
101-
ENABLE_GCC_CODEGEN: "1"
102101
# We are adding (temporarily) a dummy commit on the compiler
103102
READ_ONLY_SRC: "0"
104103
DOCKER_SCRIPT: x86_64-gnu-llvm.sh

tests/codegen/debug-column.rs

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

65
#[rustfmt::skip]
@@ -14,8 +13,8 @@ fn main() {
1413
// CHECK: call void @turtle(){{( #[0-9]+)?}}, !dbg [[B:!.*]]
1514
/* ż */ turtle();
1615

17-
// CHECK: [[A]] = !DILocation(line: 11, column: 9,
18-
// CHECK: [[B]] = !DILocation(line: 15, column: 10,
16+
// CHECK: [[A]] = !DILocation(line: 10, column: 9,
17+
// CHECK: [[B]] = !DILocation(line: 14, column: 10,
1918
}
2019
}
2120

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

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
//@ compile-flags: -C no-prepopulate-passes -C panic=abort -C force-unwind-tables=n
2-
//@ ignore-windows
32

43
#![crate_type = "lib"]
54

tests/codegen/gdb_debug_script_load.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
//
21
//@ ignore-windows
32
//@ ignore-apple
43
//@ ignore-wasm

tests/codegen/remap_path_prefix/issue-73167-remap-std.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
//@ ignore-windows
2-
31
//@ compile-flags: -g -C no-prepopulate-passes -Z simulate-remapped-rust-src-base=/rustc/xyz
42

53
// Here we check that importing std will not cause real path to std source files

tests/codegen/remap_path_prefix/main.rs

-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
//@ ignore-windows
2-
//
3-
41
//@ compile-flags: -g -C no-prepopulate-passes --remap-path-prefix={{cwd}}=/the/cwd --remap-path-prefix={{src-base}}=/the/src -Zinline-mir=no
52
//@ aux-build:remap_path_prefix_aux.rs
63

tests/codegen/remap_path_prefix/xcrate-generic.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
//@ ignore-windows
21
//@ compile-flags: -g -C metadata=foo -C no-prepopulate-passes
32
//@ aux-build:xcrate-generic.rs
43

tests/codegen/thread-local.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
//@ compile-flags: -O
22
//@ aux-build:thread_local_aux.rs
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/crashes/132981.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
//@ known-bug: #132981
22
//@compile-flags: -Clink-dead-code=true --crate-type lib
33
//@ only-x86_64
4-
//@ ignore-windows
54

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

tests/incremental/issue-54059.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
//@ proc-macro: issue-54059.rs
2-
//@ ignore-windows - dealing with weird symbols issues on dylibs isn't worth it
32
//@ revisions: rpass1
43

54
extern crate issue_54059;

tests/run-make/naked-symbol-visibility/rmake.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
//@ ignore-windows
21
//@ only-x86_64
32
use run_make_support::object::ObjectSymbol;
43
use run_make_support::object::read::{File, Object, Symbol};

tests/run-make/remap-path-prefix-dwarf/rmake.rs

-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
// It tests several cases, each of them has a detailed description attached to it.
55
// See https://github.com/rust-lang/rust/pull/96867
66

7-
//@ ignore-windows
8-
// Reason: the remap path prefix is not printed in the dwarf dump.
9-
107
use run_make_support::{cwd, is_darwin, llvm_dwarfdump, rust_lib_name, rustc};
118

129
fn main() {

tests/run-make/textrel-on-minimal-lib/rmake.rs

-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
// See https://github.com/rust-lang/rust/issues/68794
77

88
//@ ignore-cross-compile
9-
//@ ignore-windows
10-
// Reason: There is no `bar.dll` produced by CC to run readobj on
119

1210
use run_make_support::{
1311
cc, dynamic_lib_name, extra_c_flags, extra_cxx_flags, llvm_readobj, rustc, static_lib_name,

tests/rustdoc-ui/doctest/failed-doctest-output.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
//@ ignore-windows
21
// There's a parallel version of this test for Windows.
32

43
// Issue #51162: A failed doctest was not printing its stdout/stderr

tests/rustdoc-ui/doctest/failed-doctest-output.stdout

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11

22
running 2 tests
3-
test $DIR/failed-doctest-output.rs - OtherStruct (line 25) ... FAILED
4-
test $DIR/failed-doctest-output.rs - SomeStruct (line 15) ... FAILED
3+
test $DIR/failed-doctest-output.rs - OtherStruct (line 24) ... FAILED
4+
test $DIR/failed-doctest-output.rs - SomeStruct (line 14) ... FAILED
55

66
failures:
77

8-
---- $DIR/failed-doctest-output.rs - OtherStruct (line 25) stdout ----
8+
---- $DIR/failed-doctest-output.rs - OtherStruct (line 24) stdout ----
99
error[E0425]: cannot find value `no` in this scope
10-
--> $DIR/failed-doctest-output.rs:26:1
10+
--> $DIR/failed-doctest-output.rs:25:1
1111
|
1212
LL | no
1313
| ^^ not found in this scope
@@ -16,7 +16,7 @@ error: aborting due to 1 previous error
1616

1717
For more information about this error, try `rustc --explain E0425`.
1818
Couldn't compile the test.
19-
---- $DIR/failed-doctest-output.rs - SomeStruct (line 15) stdout ----
19+
---- $DIR/failed-doctest-output.rs - SomeStruct (line 14) stdout ----
2020
Test executable failed (exit status: 101).
2121

2222
stdout:
@@ -33,8 +33,8 @@ note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
3333

3434

3535
failures:
36-
$DIR/failed-doctest-output.rs - OtherStruct (line 25)
37-
$DIR/failed-doctest-output.rs - SomeStruct (line 15)
36+
$DIR/failed-doctest-output.rs - OtherStruct (line 24)
37+
$DIR/failed-doctest-output.rs - SomeStruct (line 14)
3838

3939
test result: FAILED. 0 passed; 2 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
4040

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11

22
running 1 test
3-
test $DIR/relative-path-include-bytes-132203.rs - (line 18) ... FAILED
3+
test $DIR/relative-path-include-bytes-132203.rs - (line 17) ... FAILED
44

55
failures:
66

7-
---- $DIR/relative-path-include-bytes-132203.rs - (line 18) stdout ----
7+
---- $DIR/relative-path-include-bytes-132203.rs - (line 17) stdout ----
88
error: couldn't read `$DIR/relative-dir-empty-file`: No such file or directory (os error 2)
9-
--> $DIR/relative-path-include-bytes-132203.rs:19:9
9+
--> $DIR/relative-path-include-bytes-132203.rs:18:9
1010
|
1111
LL | let x = include_bytes!("relative-dir-empty-file");
1212
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -18,7 +18,7 @@ error: aborting due to 1 previous error
1818
Couldn't compile the test.
1919

2020
failures:
21-
$DIR/relative-path-include-bytes-132203.rs - (line 18)
21+
$DIR/relative-path-include-bytes-132203.rs - (line 17)
2222

2323
test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
2424

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

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
//@ ignore-windows
21
//@ revisions: edition2015 edition2024
32
//@[edition2015]edition:2015
43
//@[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-3
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@
2727
//@ ignore-android
2828
//@ ignore-arm
2929
//@ ignore-aarch64
30-
//@ ignore-windows
31-
32-
// note: windows is ignored as rust_test_helpers does not have the sysv64 abi on windows
3330

3431
#[allow(dead_code)]
3532
#[allow(improper_ctypes)]
@@ -111,6 +108,7 @@ mod tests {
111108
pub fn rust_dbg_extern_identity_u32(v: u32) -> u32;
112109
pub fn rust_dbg_extern_identity_u64(v: u64) -> u64;
113110
pub fn rust_dbg_extern_identity_double(v: f64) -> f64;
111+
#[cfg(not(target_env = "msvc"))] // MSVC doesn't allow empty structs or unions
114112
pub fn rust_dbg_extern_empty_struct(v1: ManyInts, e: Empty, v2: ManyInts);
115113
pub fn rust_dbg_extern_identity_TwoU8s(v: TwoU8s) -> TwoU8s;
116114
pub fn rust_dbg_extern_identity_TwoU16s(v: TwoU16s) -> TwoU16s;
@@ -181,6 +179,7 @@ mod tests {
181179
}
182180
}
183181

182+
#[cfg(not(target_env = "msvc"))]
184183
pub fn extern_pass_empty() {
185184
unsafe {
186185
let x = ManyInts {

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
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
//@ ignore-windows
21
//@ aux-build:cfg-target-thread-local.rs
32

43
#![feature(thread_local)]

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0658]: `cfg(target_thread_local)` is experimental and subject to change
2-
--> $DIR/feature-gate-cfg-target-thread-local.rs:9:16
2+
--> $DIR/feature-gate-cfg-target-thread-local.rs:8:16
33
|
44
LL | #[cfg_attr(target_thread_local, thread_local)]
55
| ^^^^^^^^^^^^^^^^^^^
@@ -9,7 +9,7 @@ LL | #[cfg_attr(target_thread_local, thread_local)]
99
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
1010

1111
error[E0133]: use of extern static is unsafe and requires unsafe function or block
12-
--> $DIR/feature-gate-cfg-target-thread-local.rs:15:16
12+
--> $DIR/feature-gate-cfg-target-thread-local.rs:14:16
1313
|
1414
LL | assert_eq!(FOO, 3);
1515
| ^^^ use of extern static

0 commit comments

Comments
 (0)