Skip to content

Commit 785a383

Browse files
authored
[beta-1.91] chore: Disabled reserved_windows_name test temporaily (#16050)
Beta backports - e906ad9 (ignoring flaky test otherwise it sometimes fails rust-lang/rust beta backport) In order to make CI pass, the following PRs are also cherry-picked: - b6d572b - c249c45
2 parents e8288e9 + e602d31 commit 785a383

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,7 @@ jobs:
276276
- run: rustup update nightly && rustup default nightly
277277
- run: rustup update stable
278278
- run: rustup component add rust-docs
279+
- run: rustup component add rustfmt --toolchain stable
279280
- run: ci/validate-man.sh
280281
# This requires rustfmt, use stable.
281282
- name: Run semver-check

tests/build-std/main.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,9 @@ fn test_proc_macro() {
396396
}
397397

398398
#[cargo_test(build_std_real)]
399-
fn test_panic_abort() {
399+
fn default_features_still_included_with_extra_build_std_features() {
400+
// This is a regression test to ensure when adding extra `build-std-features`,
401+
// the default feature set is still respected and included.
400402
// See rust-lang/cargo#14935
401403
let p = project()
402404
.file(
@@ -413,7 +415,7 @@ fn test_panic_abort() {
413415
p.cargo("check")
414416
.build_std_arg("std,panic_abort")
415417
.env("RUSTFLAGS", "-C panic=abort")
416-
.arg("-Zbuild-std-features=panic_immediate_abort")
418+
.arg("-Zbuild-std-features=optimize_for_size")
417419
.run();
418420
}
419421

tests/testsuite/package.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2934,7 +2934,9 @@ src/lib.rs
29342934
.run();
29352935
}
29362936

2937-
#[cargo_test]
2937+
#[cargo_test(
2938+
ignore_windows = "temporarily disabling due to flakiness: https://rust-lang.zulipchat.com/#narrow/channel/246057-t-cargo/topic/reserved_windows_name.20test.20failing/with/543085230"
2939+
)]
29382940
#[cfg(windows)]
29392941
fn reserved_windows_name() {
29402942
// If we are running on a version of Windows that allows these reserved filenames,

0 commit comments

Comments
 (0)