Migrate most of the existing coverage tests over to run-coverage

rust-lang · Jun 28, 2023 · e0625b4 · e0625b4
1 parent 22e119b
commit e0625b4
Show file tree

Hide file tree

Showing 81 changed files with 24 additions and 20 deletions.
diff --git a/...-reports/expected_show_coverage.abort.txt → tests/run-coverage/abort.coverage b/...-reports/expected_show_coverage.abort.txt → tests/run-coverage/abort.coverage
diff --git a/tests/run-make/coverage/abort.rs → tests/run-coverage/abort.rs b/tests/run-make/coverage/abort.rs → tests/run-coverage/abort.rs
diff --git a/...reports/expected_show_coverage.assert.txt → tests/run-coverage/assert.coverage b/...reports/expected_show_coverage.assert.txt → tests/run-coverage/assert.coverage
@@ -1,5 +1,5 @@
     1|       |#![allow(unused_assignments)]
-    2|       |// expect-exit-status-101
+    2|       |// failure-status: 101
     3|       |
     4|      4|fn might_fail_assert(one_plus_one: u32) {
     5|      4|    println!("does 1 + 1 = {}?", one_plus_one);

diff --git a/tests/run-make/coverage/assert.rs → tests/run-coverage/assert.rs b/tests/run-make/coverage/assert.rs → tests/run-coverage/assert.rs
@@ -1,5 +1,5 @@
 #![allow(unused_assignments)]
-// expect-exit-status-101
+// failure-status: 101
 
 fn might_fail_assert(one_plus_one: u32) {
     println!("does 1 + 1 = {}?", one_plus_one);

diff --git a/...-reports/expected_show_coverage.async.txt → tests/run-coverage/async.coverage b/...-reports/expected_show_coverage.async.txt → tests/run-coverage/async.coverage
diff --git a/tests/run-make/coverage/async.rs → tests/run-coverage/async.rs b/tests/run-make/coverage/async.rs → tests/run-coverage/async.rs
diff --git a/...reports/expected_show_coverage.async2.txt → tests/run-coverage/async2.coverage b/...reports/expected_show_coverage.async2.txt → tests/run-coverage/async2.coverage
diff --git a/tests/run-make/coverage/async2.rs → tests/run-coverage/async2.rs b/tests/run-make/coverage/async2.rs → tests/run-coverage/async2.rs
diff --git a/...eports/expected_show_coverage.closure.txt → tests/run-coverage/closure.coverage b/...eports/expected_show_coverage.closure.txt → tests/run-coverage/closure.coverage
@@ -1,6 +1,6 @@
     1|       |#![allow(unused_assignments, unused_variables)]
-    2|       |// compile-flags: -C opt-level=2 # fix described in rustc_middle/mir/mono.rs
-    3|      1|fn main() {
+    2|       |// compile-flags: -C opt-level=2
+    3|      1|fn main() { // ^^ fix described in rustc_middle/mir/mono.rs
     4|      1|    // Initialize test constants in a way that cannot be determined at compile time, to ensure
     5|      1|    // rustc and LLVM cannot optimize out statements (or coverage counters) downstream from
     6|      1|    // dependent conditions.

diff --git a/tests/run-make/coverage/closure.rs → tests/run-coverage/closure.rs b/tests/run-make/coverage/closure.rs → tests/run-coverage/closure.rs
@@ -1,6 +1,6 @@
 #![allow(unused_assignments, unused_variables)]
-// compile-flags: -C opt-level=2 # fix described in rustc_middle/mir/mono.rs
-fn main() {
+// compile-flags: -C opt-level=2
+fn main() { // ^^ fix described in rustc_middle/mir/mono.rs
     // Initialize test constants in a way that cannot be determined at compile time, to ensure
     // rustc and LLVM cannot optimize out statements (or coverage counters) downstream from
     // dependent conditions.

diff --git a/.../expected_show_coverage.closure_macro.txt → tests/run-coverage/closure_macro.coverage b/.../expected_show_coverage.closure_macro.txt → tests/run-coverage/closure_macro.coverage
diff --git a/tests/run-make/coverage/closure_macro.rs → tests/run-coverage/closure_macro.rs b/tests/run-make/coverage/closure_macro.rs → tests/run-coverage/closure_macro.rs
diff --git a/...ted_show_coverage.closure_macro_async.txt → ...run-coverage/closure_macro_async.coverage b/...ted_show_coverage.closure_macro_async.txt → ...run-coverage/closure_macro_async.coverage
diff --git a/.../run-make/coverage/closure_macro_async.rs → tests/run-coverage/closure_macro_async.rs b/.../run-make/coverage/closure_macro_async.rs → tests/run-coverage/closure_macro_async.rs
diff --git a/...rts/expected_show_coverage.conditions.txt → tests/run-coverage/conditions.coverage b/...rts/expected_show_coverage.conditions.txt → tests/run-coverage/conditions.coverage
diff --git a/tests/run-make/coverage/conditions.rs → tests/run-coverage/conditions.rs b/tests/run-make/coverage/conditions.rs → tests/run-coverage/conditions.rs
diff --git a/...ports/expected_show_coverage.continue.txt → tests/run-coverage/continue.coverage b/...ports/expected_show_coverage.continue.txt → tests/run-coverage/continue.coverage
diff --git a/tests/run-make/coverage/continue.rs → tests/run-coverage/continue.rs b/tests/run-make/coverage/continue.rs → tests/run-coverage/continue.rs
diff --git a/...orts/expected_show_coverage.dead_code.txt → tests/run-coverage/dead_code.coverage b/...orts/expected_show_coverage.dead_code.txt → tests/run-coverage/dead_code.coverage
diff --git a/tests/run-make/coverage/dead_code.rs → tests/run-coverage/dead_code.rs b/tests/run-make/coverage/dead_code.rs → tests/run-coverage/dead_code.rs
diff --git a/...rts/expected_show_coverage.drop_trait.txt → tests/run-coverage/drop_trait.coverage b/...rts/expected_show_coverage.drop_trait.txt → tests/run-coverage/drop_trait.coverage
@@ -1,5 +1,5 @@
     1|       |#![allow(unused_assignments)]
-    2|       |// expect-exit-status-1
+    2|       |// failure-status: 1
     3|       |
     4|       |struct Firework {
     5|       |    strength: i32,

diff --git a/tests/run-make/coverage/drop_trait.rs → tests/run-coverage/drop_trait.rs b/tests/run-make/coverage/drop_trait.rs → tests/run-coverage/drop_trait.rs
@@ -1,5 +1,5 @@
 #![allow(unused_assignments)]
-// expect-exit-status-1
+// failure-status: 1
 
 struct Firework {
     strength: i32,

diff --git a/...orts/expected_show_coverage.generator.txt → tests/run-coverage/generator.coverage b/...orts/expected_show_coverage.generator.txt → tests/run-coverage/generator.coverage
diff --git a/tests/run-make/coverage/generator.rs → tests/run-coverage/generator.rs b/tests/run-make/coverage/generator.rs → tests/run-coverage/generator.rs
diff --git a/...ports/expected_show_coverage.generics.txt → tests/run-coverage/generics.coverage b/...ports/expected_show_coverage.generics.txt → tests/run-coverage/generics.coverage
@@ -1,5 +1,5 @@
     1|       |#![allow(unused_assignments)]
-    2|       |// expect-exit-status-1
+    2|       |// failure-status: 1
     3|       |
     4|       |struct Firework<T> where T: Copy + std::fmt::Display {
     5|       |    strength: T,

diff --git a/tests/run-make/coverage/generics.rs → tests/run-coverage/generics.rs b/tests/run-make/coverage/generics.rs → tests/run-coverage/generics.rs
@@ -1,5 +1,5 @@
 #![allow(unused_assignments)]
-// expect-exit-status-1
+// failure-status: 1
 
 struct Firework<T> where T: Copy + std::fmt::Display {
     strength: T,

diff --git a/...age-reports/expected_show_coverage.if.txt → tests/run-coverage/if.coverage b/...age-reports/expected_show_coverage.if.txt → tests/run-coverage/if.coverage
diff --git a/tests/run-make/coverage/if.rs → tests/run-coverage/if.rs b/tests/run-make/coverage/if.rs → tests/run-coverage/if.rs
diff --git a/...eports/expected_show_coverage.if_else.txt → tests/run-coverage/if_else.coverage b/...eports/expected_show_coverage.if_else.txt → tests/run-coverage/if_else.coverage
diff --git a/tests/run-make/coverage/if_else.rs → tests/run-coverage/if_else.rs b/tests/run-make/coverage/if_else.rs → tests/run-coverage/if_else.rs
diff --git a/...ts/expected_show_coverage.inline-dead.txt → tests/run-coverage/inline-dead.coverage b/...ts/expected_show_coverage.inline-dead.txt → tests/run-coverage/inline-dead.coverage
diff --git a/tests/run-make/coverage/inline-dead.rs → tests/run-coverage/inline-dead.rs b/tests/run-make/coverage/inline-dead.rs → tests/run-coverage/inline-dead.rs
diff --git a/...reports/expected_show_coverage.inline.txt → tests/run-coverage/inline.coverage b/...reports/expected_show_coverage.inline.txt → tests/run-coverage/inline.coverage
diff --git a/tests/run-make/coverage/inline.rs → tests/run-coverage/inline.rs b/tests/run-make/coverage/inline.rs → tests/run-coverage/inline.rs
diff --git a/...ts/expected_show_coverage.inner_items.txt → tests/run-coverage/inner_items.coverage b/...ts/expected_show_coverage.inner_items.txt → tests/run-coverage/inner_items.coverage
diff --git a/tests/run-make/coverage/inner_items.rs → tests/run-coverage/inner_items.rs b/tests/run-make/coverage/inner_items.rs → tests/run-coverage/inner_items.rs
diff --git a/...ts/expected_show_coverage.issue-83601.txt → tests/run-coverage/issue-83601.coverage b/...ts/expected_show_coverage.issue-83601.txt → tests/run-coverage/issue-83601.coverage
diff --git a/tests/run-make/coverage/issue-83601.rs → tests/run-coverage/issue-83601.rs b/tests/run-make/coverage/issue-83601.rs → tests/run-coverage/issue-83601.rs
diff --git a/...ts/expected_show_coverage.issue-84561.txt → tests/run-coverage/issue-84561.coverage b/...ts/expected_show_coverage.issue-84561.txt → tests/run-coverage/issue-84561.coverage
@@ -1,6 +1,6 @@
     1|       |// This demonstrated Issue #84561: function-like macros produce unintuitive coverage results.
     2|       |
-    3|       |// expect-exit-status-101
+    3|       |// failure-status: 101
     4|     21|#[derive(PartialEq, Eq)]
     5|       |struct Foo(u32);
     6|      1|fn test3() {

diff --git a/tests/run-make/coverage/issue-84561.rs → tests/run-coverage/issue-84561.rs b/tests/run-make/coverage/issue-84561.rs → tests/run-coverage/issue-84561.rs
@@ -1,6 +1,6 @@
 // This demonstrated Issue #84561: function-like macros produce unintuitive coverage results.
 
-// expect-exit-status-101
+// failure-status: 101
 #[derive(PartialEq, Eq)]
 struct Foo(u32);
 fn test3() {

diff --git a/...ts/expected_show_coverage.issue-93054.txt → tests/run-coverage/issue-93054.coverage b/...ts/expected_show_coverage.issue-93054.txt → tests/run-coverage/issue-93054.coverage
diff --git a/tests/run-make/coverage/issue-93054.rs → tests/run-coverage/issue-93054.rs b/tests/run-make/coverage/issue-93054.rs → tests/run-coverage/issue-93054.rs
diff --git a/...s/expected_show_coverage.lazy_boolean.txt → tests/run-coverage/lazy_boolean.coverage b/...s/expected_show_coverage.lazy_boolean.txt → tests/run-coverage/lazy_boolean.coverage
diff --git a/tests/run-make/coverage/lazy_boolean.rs → tests/run-coverage/lazy_boolean.rs b/tests/run-make/coverage/lazy_boolean.rs → tests/run-coverage/lazy_boolean.rs
diff --git a/...pected_show_coverage.loop_break_value.txt → tests/run-coverage/loop_break_value.coverage b/...pected_show_coverage.loop_break_value.txt → tests/run-coverage/loop_break_value.coverage
diff --git a/tests/run-make/coverage/loop_break_value.rs → tests/run-coverage/loop_break_value.rs b/tests/run-make/coverage/loop_break_value.rs → tests/run-coverage/loop_break_value.rs
diff --git a/...expected_show_coverage.loops_branches.txt → tests/run-coverage/loops_branches.coverage b/...expected_show_coverage.loops_branches.txt → tests/run-coverage/loops_branches.coverage
diff --git a/tests/run-make/coverage/loops_branches.rs → tests/run-coverage/loops_branches.rs b/tests/run-make/coverage/loops_branches.rs → tests/run-coverage/loops_branches.rs
diff --git a/...pected_show_coverage.match_or_pattern.txt → tests/run-coverage/match_or_pattern.coverage b/...pected_show_coverage.match_or_pattern.txt → tests/run-coverage/match_or_pattern.coverage
diff --git a/tests/run-make/coverage/match_or_pattern.rs → tests/run-coverage/match_or_pattern.rs b/tests/run-make/coverage/match_or_pattern.rs → tests/run-coverage/match_or_pattern.rs
diff --git a/...s/expected_show_coverage.nested_loops.txt → tests/run-coverage/nested_loops.coverage b/...s/expected_show_coverage.nested_loops.txt → tests/run-coverage/nested_loops.coverage
diff --git a/tests/run-make/coverage/nested_loops.rs → tests/run-coverage/nested_loops.rs b/tests/run-make/coverage/nested_loops.rs → tests/run-coverage/nested_loops.rs
diff --git a/...s/expected_show_coverage.no_cov_crate.txt → tests/run-coverage/no_cov_crate.coverage b/...s/expected_show_coverage.no_cov_crate.txt → tests/run-coverage/no_cov_crate.coverage
diff --git a/tests/run-make/coverage/no_cov_crate.rs → tests/run-coverage/no_cov_crate.rs b/tests/run-make/coverage/no_cov_crate.rs → tests/run-coverage/no_cov_crate.rs
diff --git a/...ports/expected_show_coverage.overflow.txt → tests/run-coverage/overflow.coverage b/...ports/expected_show_coverage.overflow.txt → tests/run-coverage/overflow.coverage
@@ -1,5 +1,5 @@
     1|       |#![allow(unused_assignments)]
-    2|       |// expect-exit-status-101
+    2|       |// failure-status: 101
     3|       |
     4|      4|fn might_overflow(to_add: u32) -> u32 {
     5|      4|    if to_add > 5 {

diff --git a/tests/run-make/coverage/overflow.rs → tests/run-coverage/overflow.rs b/tests/run-make/coverage/overflow.rs → tests/run-coverage/overflow.rs
@@ -1,5 +1,5 @@
 #![allow(unused_assignments)]
-// expect-exit-status-101
+// failure-status: 101
 
 fn might_overflow(to_add: u32) -> u32 {
     if to_add > 5 {

diff --git a/...s/expected_show_coverage.panic_unwind.txt → tests/run-coverage/panic_unwind.coverage b/...s/expected_show_coverage.panic_unwind.txt → tests/run-coverage/panic_unwind.coverage
@@ -1,5 +1,5 @@
     1|       |#![allow(unused_assignments)]
-    2|       |// expect-exit-status-101
+    2|       |// failure-status: 101
     3|       |
     4|      4|fn might_panic(should_panic: bool) {
     5|      4|    if should_panic {

diff --git a/tests/run-make/coverage/panic_unwind.rs → tests/run-coverage/panic_unwind.rs b/tests/run-make/coverage/panic_unwind.rs → tests/run-coverage/panic_unwind.rs
@@ -1,5 +1,5 @@
 #![allow(unused_assignments)]
-// expect-exit-status-101
+// failure-status: 101
 
 fn might_panic(should_panic: bool) {
     if should_panic {

diff --git a/...rts/expected_show_coverage.partial_eq.txt → tests/run-coverage/partial_eq.coverage b/...rts/expected_show_coverage.partial_eq.txt → tests/run-coverage/partial_eq.coverage
diff --git a/tests/run-make/coverage/partial_eq.rs → tests/run-coverage/partial_eq.rs b/tests/run-make/coverage/partial_eq.rs → tests/run-coverage/partial_eq.rs
diff --git a/...ts/expected_show_coverage.simple_loop.txt → tests/run-coverage/simple_loop.coverage b/...ts/expected_show_coverage.simple_loop.txt → tests/run-coverage/simple_loop.coverage
diff --git a/tests/run-make/coverage/simple_loop.rs → tests/run-coverage/simple_loop.rs b/tests/run-make/coverage/simple_loop.rs → tests/run-coverage/simple_loop.rs
diff --git a/...s/expected_show_coverage.simple_match.txt → tests/run-coverage/simple_match.coverage b/...s/expected_show_coverage.simple_match.txt → tests/run-coverage/simple_match.coverage
diff --git a/tests/run-make/coverage/simple_match.rs → tests/run-coverage/simple_match.rs b/tests/run-make/coverage/simple_match.rs → tests/run-coverage/simple_match.rs
diff --git a/...ts/expected_show_coverage.sort_groups.txt → tests/run-coverage/sort_groups.coverage b/...ts/expected_show_coverage.sort_groups.txt → tests/run-coverage/sort_groups.coverage
diff --git a/tests/run-make/coverage/sort_groups.rs → tests/run-coverage/sort_groups.rs b/tests/run-make/coverage/sort_groups.rs → tests/run-coverage/sort_groups.rs
diff --git a/...s/expected_show_coverage.test_harness.txt → tests/run-coverage/test_harness.coverage b/...s/expected_show_coverage.test_harness.txt → tests/run-coverage/test_harness.coverage
diff --git a/tests/run-make/coverage/test_harness.rs → tests/run-coverage/test_harness.rs b/tests/run-make/coverage/test_harness.rs → tests/run-coverage/test_harness.rs
diff --git a/...expected_show_coverage.tight_inf_loop.txt → tests/run-coverage/tight_inf_loop.coverage b/...expected_show_coverage.tight_inf_loop.txt → tests/run-coverage/tight_inf_loop.coverage
diff --git a/tests/run-make/coverage/tight_inf_loop.rs → tests/run-coverage/tight_inf_loop.rs b/tests/run-make/coverage/tight_inf_loop.rs → tests/run-coverage/tight_inf_loop.rs
diff --git a/...pected_show_coverage.try_error_result.txt → tests/run-coverage/try_error_result.coverage b/...pected_show_coverage.try_error_result.txt → tests/run-coverage/try_error_result.coverage
@@ -1,5 +1,5 @@
     1|       |#![allow(unused_assignments)]
-    2|       |// expect-exit-status-1
+    2|       |// failure-status: 1
     3|       |
     4|      6|fn call(return_error: bool) -> Result<(),()> {
     5|      6|    if return_error {

diff --git a/tests/run-make/coverage/try_error_result.rs → tests/run-coverage/try_error_result.rs b/tests/run-make/coverage/try_error_result.rs → tests/run-coverage/try_error_result.rs
@@ -1,5 +1,5 @@
 #![allow(unused_assignments)]
-// expect-exit-status-1
+// failure-status: 1
 
 fn call(return_error: bool) -> Result<(),()> {
     if return_error {

diff --git a/...reports/expected_show_coverage.unused.txt → tests/run-coverage/unused.coverage b/...reports/expected_show_coverage.unused.txt → tests/run-coverage/unused.coverage
diff --git a/tests/run-make/coverage/unused.rs → tests/run-coverage/unused.rs b/tests/run-make/coverage/unused.rs → tests/run-coverage/unused.rs
diff --git a/...-reports/expected_show_coverage.while.txt → tests/run-coverage/while.coverage b/...-reports/expected_show_coverage.while.txt → tests/run-coverage/while.coverage
diff --git a/tests/run-make/coverage/while.rs → tests/run-coverage/while.rs b/tests/run-make/coverage/while.rs → tests/run-coverage/while.rs
diff --git a/...xpected_show_coverage.while_early_ret.txt → tests/run-coverage/while_early_ret.coverage b/...xpected_show_coverage.while_early_ret.txt → tests/run-coverage/while_early_ret.coverage
@@ -1,5 +1,5 @@
     1|       |#![allow(unused_assignments)]
-    2|       |// expect-exit-status-1
+    2|       |// failure-status: 1
     3|       |
     4|      1|fn main() -> Result<(),u8> {
     5|      1|    let mut countdown = 10;

diff --git a/tests/run-make/coverage/while_early_ret.rs → tests/run-coverage/while_early_ret.rs b/tests/run-make/coverage/while_early_ret.rs → tests/run-coverage/while_early_ret.rs
@@ -1,5 +1,5 @@
 #![allow(unused_assignments)]
-// expect-exit-status-1
+// failure-status: 1
 
 fn main() -> Result<(),u8> {
     let mut countdown = 10;

diff --git a/...-reports/expected_show_coverage.yield.txt → tests/run-coverage/yield.coverage b/...-reports/expected_show_coverage.yield.txt → tests/run-coverage/yield.coverage
diff --git a/tests/run-make/coverage/yield.rs → tests/run-coverage/yield.rs b/tests/run-make/coverage/yield.rs → tests/run-coverage/yield.rs
diff --git a/tests/run-make/coverage-reports/Makefile b/tests/run-make/coverage-reports/Makefile
@@ -1,3 +1,7 @@
+# NOTE: Most of the tests previously associated with this makefile have been
+# migrated over to the custom `run-coverage` test suite instead, so only a few
+# harder-to-port tests remain here.
+
 # needs-profiler-support
 # ignore-windows-gnu