Skip to content

Commit 62e4640

Browse files
Auto merge of #142563 - jieyouxu:no-more-i686-mingw, r=<try>
[WIP] Refine run-make test ignores due to unpredictable `i686-pc-windows-gnu` unwind mechanism Closes #128911. This PR *re-enables* the `dump-ice-to-disk` test and the unstable feature usage metrics tests for {x86_64,i686} Windows MSVC hosts and x86_64 Windows GNU host. I'll keep an eye out for these tests, and will broaden the ignores if this test is still flaky on not just `i686-pc-windows-gnu`. r? mati865 try-job: x86_64-msvc-1 try-job: i686-msvc-1 try-job: x86_64-mingw-1
2 parents 45acf54 + e40da5b commit 62e4640

File tree

3 files changed

+15
-18
lines changed
  • tests/run-make

3 files changed

+15
-18
lines changed

tests/run-make/dump-ice-to-disk/rmake.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
//!
1818
//! # Test history
1919
//!
20-
//! - The previous rmake.rs iteration of this test was flakey for unknown reason on `i686-mingw`
21-
//! *specifically*, so assertion failures in this test was made extremely verbose to help
22-
//! diagnose why the ICE messages was different *specifically* on `i686-mingw`.
23-
//! - An attempt is made to re-enable this test on `i686-mingw` (by removing `ignore-windows`). If
24-
//! this test is still flakey, please restore the `ignore-windows` directive.
25-
26-
//@ ignore-windows
27-
//FIXME(#128911): still flakey on i686-mingw.
20+
//! The previous rmake.rs iteration of this test was flaky for unknown reason on
21+
//! `i686-pc-windows-gnu` *specifically*, so assertion failures in this test was made extremely
22+
//! verbose to help diagnose why the ICE messages was different. It appears that backtraces on
23+
//! `i686-pc-windows-gnu` specifically are quite unpredictable in how many backtrace frames are
24+
//! involved.
25+
26+
//@ ignore-cross-compile (exercising ICE dump on host)
27+
//@ ignore-i686-pc-windows-gnu (unwind mechanism produces unpredictable backtraces)
2828

2929
use std::cell::OnceCell;
3030
use std::path::{Path, PathBuf};

tests/run-make/unstable-feature-usage-metrics-incremental/rmake.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,11 @@
77
//!
88
//! # Test history
99
//!
10-
//! - forked from dump-ice-to-disk test, which has flakeyness issues on i686-mingw, I'm assuming
11-
//! those will be present in this test as well on the same platform
10+
//! - Forked from `dump-ice-to-disk` test, which previously had backtrace unpredictability on
11+
//! `i686-pc-windows-gnu`.
1212
13-
//@ needs-target-std
14-
//@ ignore-windows
15-
//FIXME(#128911): still flakey on i686-mingw.
13+
//@ ignore-cross-compile (exercises metrics incremental on host)
14+
//@ ignore-i686-pc-windows-gnu (unwind mechanism produces unpredictable backtraces)
1615

1716
use std::path::{Path, PathBuf};
1817

tests/run-make/unstable-feature-usage-metrics/rmake.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,10 @@
77
//!
88
//! # Test history
99
//!
10-
//! - forked from dump-ice-to-disk test, which has flakeyness issues on i686-mingw, I'm assuming
11-
//! those will be present in this test as well on the same platform
10+
//! - Forked from `dump-ice-to-disk` test, where `i686-pc-windows-gnu` has unpredictable backtraces.
1211
13-
//@ needs-target-std
14-
//@ ignore-windows
15-
//FIXME(#128911): still flakey on i686-mingw.
12+
//@ ignore-cross-compile (exercises metrics dump on host)
13+
//@ ignore-i686-pc-windows-gnu (unwind mechanism produces unpredictable backtraces)
1614

1715
use std::path::{Path, PathBuf};
1816

0 commit comments

Comments
 (0)