Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(mostly) blindly enable more tests on Windows #134777

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/ci/github-actions/jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ pr:
<<: *job-linux-4c
- image: x86_64-gnu-llvm-18
env:
ENABLE_GCC_CODEGEN: "1"
# We are adding (temporarily) a dummy commit on the compiler
READ_ONLY_SRC: "0"
DOCKER_SCRIPT: x86_64-gnu-llvm.sh
Expand Down
5 changes: 2 additions & 3 deletions tests/codegen/debug-column.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// Verify that debuginfo column numbers are 1-based byte offsets.
//
//@ ignore-windows
//@ compile-flags: -C debuginfo=2

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

// CHECK: [[A]] = !DILocation(line: 11, column: 9,
// CHECK: [[B]] = !DILocation(line: 15, column: 10,
// CHECK: [[A]] = !DILocation(line: 10, column: 9,
// CHECK: [[B]] = !DILocation(line: 14, column: 10,
}
}

Expand Down
1 change: 0 additions & 1 deletion tests/codegen/force-no-unwind-tables.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//@ compile-flags: -C no-prepopulate-passes -C panic=abort -C force-unwind-tables=n
//@ ignore-windows

#![crate_type = "lib"]

Expand Down
1 change: 0 additions & 1 deletion tests/codegen/gdb_debug_script_load.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
//
//@ ignore-windows
//@ ignore-apple
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like you'd want to delete this line as well:

Suggested change
//@ ignore-windows

//@ ignore-wasm
Expand Down
2 changes: 0 additions & 2 deletions tests/codegen/remap_path_prefix/issue-73167-remap-std.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//@ ignore-windows

//@ compile-flags: -g -C no-prepopulate-passes -Z simulate-remapped-rust-src-base=/rustc/xyz

// Here we check that importing std will not cause real path to std source files
Expand Down
3 changes: 0 additions & 3 deletions tests/codegen/remap_path_prefix/main.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
//@ ignore-windows
//

//@ compile-flags: -g -C no-prepopulate-passes --remap-path-prefix={{cwd}}=/the/cwd --remap-path-prefix={{src-base}}=/the/src -Zinline-mir=no
//@ aux-build:remap_path_prefix_aux.rs

Expand Down
1 change: 0 additions & 1 deletion tests/codegen/remap_path_prefix/xcrate-generic.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
//@ ignore-windows
//@ compile-flags: -g -C metadata=foo -C no-prepopulate-passes
//@ aux-build:xcrate-generic.rs

Expand Down
1 change: 0 additions & 1 deletion tests/codegen/thread-local.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
//@ compile-flags: -O
//@ aux-build:thread_local_aux.rs
//@ ignore-windows FIXME(#84933)
//@ ignore-wasm globals are used instead of thread locals
//@ ignore-emscripten globals are used instead of thread locals
//@ ignore-android does not use #[thread_local]
Expand Down
1 change: 0 additions & 1 deletion tests/crashes/132981.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
//@ known-bug: #132981
//@compile-flags: -Clink-dead-code=true --crate-type lib
//@ only-x86_64
//@ ignore-windows

#![feature(rust_cold_cc)]
pub extern "rust-cold" fn foo(_: [usize; 3]) {}
1 change: 0 additions & 1 deletion tests/incremental/issue-54059.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//@ proc-macro: issue-54059.rs
//@ ignore-windows - dealing with weird symbols issues on dylibs isn't worth it
//@ revisions: rpass1

extern crate issue_54059;
Expand Down
1 change: 0 additions & 1 deletion tests/run-make/naked-symbol-visibility/rmake.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
//@ ignore-windows
//@ only-x86_64
use run_make_support::object::ObjectSymbol;
use run_make_support::object::read::{File, Object, Symbol};
Expand Down
3 changes: 0 additions & 3 deletions tests/run-make/remap-path-prefix-dwarf/rmake.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
// It tests several cases, each of them has a detailed description attached to it.
// See https://github.com/rust-lang/rust/pull/96867

//@ ignore-windows
// Reason: the remap path prefix is not printed in the dwarf dump.

use run_make_support::{cwd, is_darwin, llvm_dwarfdump, rust_lib_name, rustc};

fn main() {
Expand Down
2 changes: 0 additions & 2 deletions tests/run-make/textrel-on-minimal-lib/rmake.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
// See https://github.com/rust-lang/rust/issues/68794

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

use run_make_support::{
cc, dynamic_lib_name, extra_c_flags, extra_cxx_flags, llvm_readobj, rustc, static_lib_name,
Expand Down
1 change: 0 additions & 1 deletion tests/rustdoc-ui/doctest/failed-doctest-output.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
//@ ignore-windows
// There's a parallel version of this test for Windows.

// Issue #51162: A failed doctest was not printing its stdout/stderr
Expand Down
14 changes: 7 additions & 7 deletions tests/rustdoc-ui/doctest/failed-doctest-output.stdout
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@

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

failures:

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

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

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


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

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

Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@

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

failures:

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

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

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

Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
//@ ignore-windows
//@ revisions: edition2015 edition2024
//@[edition2015]edition:2015
//@[edition2015]check-fail
Expand Down
1 change: 0 additions & 1 deletion tests/ui-fulldeps/stable-mir/check_abi.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
//@ ignore-stage1
//@ ignore-cross-compile
//@ ignore-remote
//@ ignore-windows-gnu mingw has troubles with linking https://github.com/rust-lang/rust/pull/116837

#![feature(rustc_private)]
#![feature(assert_matches)]
Expand Down
1 change: 0 additions & 1 deletion tests/ui-fulldeps/stable-mir/check_allocation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
//@ ignore-stage1
//@ ignore-cross-compile
//@ ignore-remote
//@ ignore-windows-gnu mingw has troubles with linking https://github.com/rust-lang/rust/pull/116837
//@ edition: 2021

#![feature(rustc_private)]
Expand Down
1 change: 0 additions & 1 deletion tests/ui-fulldeps/stable-mir/check_attribute.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
//@ ignore-stage1
//@ ignore-cross-compile
//@ ignore-remote
//@ ignore-windows-gnu mingw has troubles with linking https://github.com/rust-lang/rust/pull/116837

#![feature(rustc_private)]

Expand Down
1 change: 0 additions & 1 deletion tests/ui-fulldeps/stable-mir/check_binop.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
//@ ignore-stage1
//@ ignore-cross-compile
//@ ignore-remote
//@ ignore-windows-gnu mingw has troubles with linking https://github.com/rust-lang/rust/pull/116837

#![feature(rustc_private)]

Expand Down
1 change: 0 additions & 1 deletion tests/ui-fulldeps/stable-mir/check_crate_defs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
//@ ignore-stage1
//@ ignore-cross-compile
//@ ignore-remote
//@ ignore-windows-gnu mingw has troubles with linking https://github.com/rust-lang/rust/pull/116837

#![feature(rustc_private)]
#![feature(assert_matches)]
Expand Down
1 change: 0 additions & 1 deletion tests/ui-fulldeps/stable-mir/check_def_ty.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
//@ ignore-stage1
//@ ignore-cross-compile
//@ ignore-remote
//@ ignore-windows-gnu mingw has troubles with linking https://github.com/rust-lang/rust/pull/116837
//@ edition: 2021

#![feature(rustc_private)]
Expand Down
1 change: 0 additions & 1 deletion tests/ui-fulldeps/stable-mir/check_defs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
//@ ignore-stage1
//@ ignore-cross-compile
//@ ignore-remote
//@ ignore-windows-gnu mingw has troubles with linking https://github.com/rust-lang/rust/pull/116837
//@ edition: 2021

#![feature(rustc_private)]
Expand Down
1 change: 0 additions & 1 deletion tests/ui-fulldeps/stable-mir/check_foreign.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
//@ ignore-stage1
//@ ignore-cross-compile
//@ ignore-remote
//@ ignore-windows-gnu mingw has troubles with linking https://github.com/rust-lang/rust/pull/116837
//@ edition: 2021

#![feature(rustc_private)]
Expand Down
1 change: 0 additions & 1 deletion tests/ui-fulldeps/stable-mir/check_instance.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
//@ ignore-stage1
//@ ignore-cross-compile
//@ ignore-remote
//@ ignore-windows-gnu mingw has troubles with linking https://github.com/rust-lang/rust/pull/116837
//@ edition: 2021

#![feature(rustc_private)]
Expand Down
1 change: 0 additions & 1 deletion tests/ui-fulldeps/stable-mir/check_intrinsics.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
//@ ignore-stage1
//@ ignore-cross-compile
//@ ignore-remote
//@ ignore-windows-gnu mingw has troubles with linking https://github.com/rust-lang/rust/pull/116837

#![feature(rustc_private)]
#![feature(assert_matches)]
Expand Down
1 change: 0 additions & 1 deletion tests/ui-fulldeps/stable-mir/check_item_kind.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
//@ ignore-stage1
//@ ignore-cross-compile
//@ ignore-remote
//@ ignore-windows-gnu mingw has troubles with linking https://github.com/rust-lang/rust/pull/116837
//@ edition: 2021

#![feature(rustc_private)]
Expand Down
1 change: 0 additions & 1 deletion tests/ui-fulldeps/stable-mir/check_normalization.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
//@ ignore-stage1
//@ ignore-cross-compile
//@ ignore-remote
//@ ignore-windows-gnu mingw has troubles with linking https://github.com/rust-lang/rust/pull/116837
//@ edition: 2021

#![feature(rustc_private)]
Expand Down
1 change: 0 additions & 1 deletion tests/ui-fulldeps/stable-mir/check_trait_queries.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
//@ ignore-stage1
//@ ignore-cross-compile
//@ ignore-remote
//@ ignore-windows-gnu mingw has troubles with linking https://github.com/rust-lang/rust/pull/116837
//@ edition: 2021

#![feature(rustc_private)]
Expand Down
1 change: 0 additions & 1 deletion tests/ui-fulldeps/stable-mir/check_transform.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
//@ ignore-stage1
//@ ignore-cross-compile
//@ ignore-remote
//@ ignore-windows-gnu mingw has troubles with linking https://github.com/rust-lang/rust/pull/116837

#![feature(rustc_private)]
#![feature(assert_matches)]
Expand Down
1 change: 0 additions & 1 deletion tests/ui-fulldeps/stable-mir/check_ty_fold.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
//@ ignore-stage1
//@ ignore-cross-compile
//@ ignore-remote
//@ ignore-windows-gnu mingw has troubles with linking https://github.com/rust-lang/rust/pull/116837
//@ edition: 2021

#![feature(rustc_private)]
Expand Down
1 change: 0 additions & 1 deletion tests/ui-fulldeps/stable-mir/compilation-result.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
//@ ignore-stage1
//@ ignore-cross-compile
//@ ignore-remote
//@ ignore-windows-gnu mingw has troubles with linking https://github.com/rust-lang/rust/pull/116837
//@ edition: 2021

#![feature(rustc_private)]
Expand Down
1 change: 0 additions & 1 deletion tests/ui-fulldeps/stable-mir/crate-info.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
//@ ignore-stage1
//@ ignore-cross-compile
//@ ignore-remote
//@ ignore-windows-gnu mingw has troubles with linking https://github.com/rust-lang/rust/pull/116837
//@ edition: 2021

#![feature(rustc_private)]
Expand Down
1 change: 0 additions & 1 deletion tests/ui-fulldeps/stable-mir/projections.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
//@ ignore-stage1
//@ ignore-cross-compile
//@ ignore-remote
//@ ignore-windows-gnu mingw has troubles with linking https://github.com/rust-lang/rust/pull/116837
//@ edition: 2021

#![feature(rustc_private)]
Expand Down
1 change: 0 additions & 1 deletion tests/ui-fulldeps/stable-mir/smir_internal.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
//@ ignore-stage1
//@ ignore-cross-compile
//@ ignore-remote
//@ ignore-windows-gnu mingw has troubles with linking https://github.com/rust-lang/rust/pull/116837
//@ edition: 2021

#![feature(rustc_private)]
Expand Down
1 change: 0 additions & 1 deletion tests/ui-fulldeps/stable-mir/smir_serde.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
//@ ignore-stage1
//@ ignore-cross-compile
//@ ignore-remote
//@ ignore-windows-gnu mingw has troubles with linking https://github.com/rust-lang/rust/pull/116837
//@ edition: 2021

#![feature(rustc_private)]
Expand Down
1 change: 0 additions & 1 deletion tests/ui-fulldeps/stable-mir/smir_visitor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
//@ ignore-stage1
//@ ignore-cross-compile
//@ ignore-remote
//@ ignore-windows-gnu mingw has troubles with linking https://github.com/rust-lang/rust/pull/116837
//@ edition: 2021

#![feature(rustc_private)]
Expand Down
6 changes: 3 additions & 3 deletions tests/ui/abi/abi-sysv64-arg-passing.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@
//@ ignore-android
//@ ignore-arm
//@ ignore-aarch64
//@ ignore-windows

// note: windows is ignored as rust_test_helpers does not have the sysv64 abi on windows

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

#[cfg(not(target_env = "msvc"))]
pub fn extern_pass_empty() {
unsafe {
let x = ManyInts {
Expand Down Expand Up @@ -425,6 +424,7 @@ fn main() {
extern_pass_u32();
extern_pass_u64();
extern_pass_double();
#[cfg(not(target_env = "msvc"))]
extern_pass_empty();
extern_pass_twou8s();
extern_pass_twou16s();
Expand Down
1 change: 0 additions & 1 deletion tests/ui/abi/large-byval-align.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
//@ compile-flags: -Copt-level=0
//@ only-x86_64
//@ ignore-windows
//@ min-llvm-version: 19
//@ build-pass

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

#![feature(thread_local)]
Expand Down
5 changes: 2 additions & 3 deletions tests/ui/inference/issue-71584.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
//@ ignore-windows different list of satisfying impls
fn main() {
let n: u32 = 1;
let mut d: u64 = 2;
let n: u16 = 1;
let mut d: u16 = 2;
d = d % n.into();
//~^ ERROR type annotations needed
}
Loading
Loading