compiletest: Store test collection context/state in two structs #131870
Conversation
The new name makes it clearer that this is a timestamp, and is collected from input files considered common to all tests.
|
r? @wesleywiser rustbot has assigned @wesleywiser. Use |
rustbot
added
A-compiletest
|
Some changes occurred in src/tools/compiletest cc @jieyouxu |
|
r? jieyouxu |
| struct TestCollector { | ||
| tests: Vec<test::TestDescAndFn>, | ||
| found_path_stems: HashSet<PathBuf>, | ||
| poisoned: bool, |
There was a problem hiding this comment.
Remark: I want to delete this poison thing and eventually just store a vec of errors/diagnostics, but anyway. Possibly still account for --fail-fast, but yeah.
There was a problem hiding this comment.
Yeah, I had an earlier draft where I tried to get rid of poisoned entirely, but in the end I decided to make this PR mostly faithful to the existing behaviour.
At some point in the future, having a list of errors instead of a boolean flag would be great.
|
@bors r+ rollup |
bors
added
S-waiting-on-bors
compiletest: Store test collection context/state in two structs This is another incremental cleanup that untangles some of the parameter passing during test collection, making it easier to see which pieces of context information are read-only, and making it easier to find where each field is used.
compiletest: Store test collection context/state in two structs This is another incremental cleanup that untangles some of the parameter passing during test collection, making it easier to see which pieces of context information are read-only, and making it easier to find where each field is used.
src/tools/compiletest/src/lib.rs
Outdated
| fn check_overlapping_tests(found_paths: &HashSet<PathBuf>) { | ||
| fn check_for_overlapping_test_paths(found_path_stems: &BTreeSet<PathBuf>) { |
There was a problem hiding this comment.
There is actually perf difference, 0710ebb
There was a problem hiding this comment.
Ahh, that was linked before #131870 (comment)
There was a problem hiding this comment.
The PR description said "Wall time didn't improved :-) ."
There was a problem hiding this comment.
Lol, I'm going to rerun some benchmarks locally
|
@bors r- |
bors
added
S-waiting-on-author
|
@Zalathar let's stick with |
Zalathar
force-pushed
the
test-collector
branch
from
cc5fd6a
to
5540976
Compare
|
BTreeSet change removed; back to the original HashSet. |
|
Thanks. @bors r+ rollup |
bors
added
S-waiting-on-bors
Rollup of 3 pull requests Successful merges: - rust-lang#126207 (std::unix::stack_overflow::drop_handler addressing todo through libc …) - rust-lang#131864 (Never emit `vptr` for empty/auto traits) - rust-lang#131870 (compiletest: Store test collection context/state in two structs) r? `@ghost` `@rustbot` modify labels: rollup
Rollup merge of rust-lang#131870 - Zalathar:test-collector, r=jieyouxu compiletest: Store test collection context/state in two structs This is another incremental cleanup that untangles some of the parameter passing during test collection, making it easier to see which pieces of context information are read-only, and making it easier to find where each field is used.
This is another incremental cleanup that untangles some of the parameter passing during test collection, making it easier to see which pieces of context information are read-only, and making it easier to find where each field is used.