Skip to content

Commit 70d7283

Browse files
committed
Auto merge of rust-lang#113389 - Zalathar:re-enable, r=Mark-Simulacrum
Re-enable some coverage tests on Linux These tests were originally disabled (on all platforms) in rust-lang#110393, because those changes had made them start failing on Linux for unclear reasons. I tried to re-enable them unconditionally in rust-lang#111179, since they worked locally on my Mac, but I found that they were still failing on Linux, so I gave up at that time. Later while working on rust-lang#112300 I was able to re-enable them on Windows and Mac, since those changes made it possible to add specific `ignore-` directives to individual tests. I noticed at the time that the tests actually seemed to be working again on Linux, but by that point I didn't want to risk more CI failures, so I left them disabled on Linux with an intention to re-enable them later. Now I'm going back to re-enable them on Linux too, since they seem to work fine. --- Because `run-coverage` tests are sensitive to line numbers, and `x test tidy` doesn't like leading blank lines, I've replaced the old comment/ignore with an informative comment that occupies the same number of lines.
2 parents 1065d87 + e4b81f6 commit 70d7283

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

tests/run-coverage/uses_crate.coverage

+2-2
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,8 @@ $DIR/auxiliary/used_crate.rs:
148148
100| |// `unused_generic_function<T>()`, below.
149149

150150
$DIR/uses_crate.rs:
151-
1| |// FIXME #110395
152-
2| |// ignore-linux
151+
1| |// This test was failing on Linux for a while due to #110393 somehow making
152+
2| |// the unused functions not instrumented, but it seems to be fine now.
153153
3| |
154154
4| |// Validates coverage now works with optimizations
155155
5| |// compile-flags: -C opt-level=3

tests/run-coverage/uses_crate.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// FIXME #110395
2-
// ignore-linux
1+
// This test was failing on Linux for a while due to #110393 somehow making
2+
// the unused functions not instrumented, but it seems to be fine now.
33

44
// Validates coverage now works with optimizations
55
// compile-flags: -C opt-level=3

tests/run-coverage/uses_inline_crate.coverage

+2-2
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,8 @@ $DIR/auxiliary/used_inline_crate.rs:
139139
90| 2|}
140140

141141
$DIR/uses_inline_crate.rs:
142-
1| |// FIXME #110395
143-
2| |// ignore-linux
142+
1| |// This test was failing on Linux for a while due to #110393 somehow making
143+
2| |// the unused functions not instrumented, but it seems to be fine now.
144144
3| |
145145
4| |// Validates coverage now works with optimizations
146146
5| |// compile-flags: -C opt-level=3

tests/run-coverage/uses_inline_crate.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// FIXME #110395
2-
// ignore-linux
1+
// This test was failing on Linux for a while due to #110393 somehow making
2+
// the unused functions not instrumented, but it seems to be fine now.
33

44
// Validates coverage now works with optimizations
55
// compile-flags: -C opt-level=3

0 commit comments

Comments
 (0)