coverage: Harmonize the coverage-map and run-coverage test directories
#117340
Conversation
|
(rustbot has picked a reviewer for you, use r? to override) |
rustbot
added
A-testsuite
|
@rustbot label +A-code-coverage |
rustbot
added
the
A-code-coverage
Zalathar
force-pushed
the
harmonize
branch
2 times, most recently
from
6aea535 to
2856753
Compare
|
Could we have a single directory doing both testsuites? |
|
That's what I'm working towards, but I'll need to make some changes to compiletest for that to work properly. So this PR is cleaning up the two test directories so that when I do make those changes, actually merging the two directories becomes a trivial step. |
|
(E.g. right now bootstrap can't actually handle a test suite having a different name from its test directory, so the obvious approach of “just point two different suites at the same directory” doesn't actually work.) |
Zalathar
force-pushed
the
harmonize
branch
2 times, most recently
from
9c38bb3 to
0520bce
Compare
What about a single directory = testsuite which runs the checks from both current testsuites? |
|
I figured out how to make the necessary changes in bootstrap without touching compiletest at all, so I've filed the full unification as #117484. |
Zalathar
force-pushed
the
harmonize
branch
2 times, most recently
from
bbe6d66 to
be743a9
Compare
coverage: Unify `tests/coverage-map` and `tests/run-coverage` into `tests/coverage` Ever since the introduction of the `coverage-map` suite, it's been awkward to have to manage two separate coverage test directories containing dozens of mostly-identical files. However, those two suites were separate for good reasons. They have very different requirements (since only one of them requires actually running the test program), running only one suite is noticeably faster than running both, and having separate suites allows them to be blessed separately if desired. So while unifying them was an obvious idea, actually doing so was non-trivial. --- Nevertheless, this PR finds a way to merge the two suites into one directory while retaining almost all of the developer-experience benefits of having two suites. This required non-trivial implementations of `Step`, but the end result works very smoothly. --- The first 5 commits are a copy of rust-lang#117340, which is a necessary prerequisite, though they can be reviewed directly as part of this PR if desired.
This is a step towards being able to unify the two coverage test directories. There are two tests that require adjustment: - `overflow.rs` requires an explicit `-Coverflow-checks=yes` - `sort_groups.rs` is sensitive to provably unused instantiations
There is another test named `if.rs` in `tests/coverage-map/status-quo/`, so this test stands in the way of flattening that directory into its parent. Fortunately both tests are more-or-less equivalent, so removing this one is fine.
These multi-file tests were not copied over in rust-lang#114843 because they weren't working, but it turns out that they just need the correct crate-type.
|
r? cjgillot |
|
These changes have been incorporated into #117484, which has received an r+ but encountered test failures on Windows that have now been fixed. So instead of approving this PR, it might make more sense to re-approve the combined PR and merge both parts in one go. |
|
Yeah, sounds good, let's close this PR then, if you don't mind. |
coverage: Unify `tests/coverage-map` and `tests/run-coverage` into `tests/coverage` Ever since the introduction of the `coverage-map` suite, it's been awkward to have to manage two separate coverage test directories containing dozens of mostly-identical files. However, those two suites were separate for good reasons. They have very different requirements (since only one of them requires actually running the test program), running only one suite is noticeably faster than running both, and having separate suites allows them to be blessed separately if desired. So while unifying them was an obvious idea, actually doing so was non-trivial. --- Nevertheless, this PR finds a way to merge the two suites into one directory while retaining almost all of the developer-experience benefits of having two suites. This required non-trivial implementations of `Step`, but the end result works very smoothly. --- The first 5 commits are a copy of rust-lang#117340, which has been closed in favour of this PR.
While exploring ways to merge these two separate test directories into one directory, I quickly found that an important first step is to harmonize the two directories so that their sets of enclosed
*.rsfiles are completely identical, instead of just mostly-identical.This has been split off into its own PR so that it can be reviewed independently as a smaller unit.
I’m still working on ways to actually combine these two test directories into one shared directory; that work will build on top of this PR.The two directories will be fully unified by #117484, which builds on top of these changes.Closed in favour of #117484, which incorporates all of these changes.