[`compiletest`-related cleanups 4/7] Make the distinction between root build directory vs test suite specific build directory in compiletest less confusing by jieyouxu · Pull Request #136542 · rust-lang/rust

jieyouxu · 2025-02-04T14:06:58Z

Reference for overall changes: #136437
Part 4 of 7 of the compiletest-related cleanups PR series.

Summary

Remove --build-base compiletest flag, and introduce --build-{root,test-suite-root} flags instead. --build-base previously actually is test suite specific build directory, not the root build/ directory.
Feed the root build directory directly from bootstrap to compiletest via --build-root instead of doing multiple layers of parent unwrapping¹ based on the test suite specific build directory.
Remove a redundant to_path_buf().

r? bootstrap

Please do not unwrap the parents. ↩

jieyouxu · 2025-02-04T14:08:03Z

@rustbot blocked (on #136472 and #136474)

bors · 2025-02-10T15:34:43Z

☔ The latest upstream changes (presumably #136809) made this pull request unmergeable. Please resolve the merge conflicts.

bors · 2025-02-22T06:58:47Z

☔ The latest upstream changes (presumably #137406) made this pull request unmergeable. Please resolve the merge conflicts.

…ic build dir - Introduce and use `--build-{root,test-suite-root}` over `--build-base`. - A few minor cleanups.

…test-suite-root` instead

jieyouxu · 2025-02-23T13:50:05Z

Rebased after #136474 merged.
@rustbot ready

onur-ozkan

LGTM

onur-ozkan · 2025-02-26T10:42:34Z

@bors r+

bors · 2025-02-26T10:42:36Z

📌 Commit 7d2e4e4 has been approved by onur-ozkan

It is now in the queue for this repository.

[`compiletest`-related cleanups 4/7] Make the distinction between root build directory vs test suite specific build directory in compiletest less confusing Reference for overall changes: rust-lang#136437 Part **4** of **7** of the *`compiletest`-related cleanups* PR series. ### Summary - Remove `--build-base` compiletest flag, and introduce `--build-{root,test-suite-root}` flags instead. `--build-base` previously actually is test suite specific build directory, not the root `build/` directory. - Feed the root build directory directly from bootstrap to compiletest via `--build-root` instead of doing multiple layers of parent unwrapping[^parent] based on the test suite specific build directory. - Remove a redundant `to_path_buf()`. [^parent]: Please do not unwrap the parents. r? bootstrap

…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#136542 ([`compiletest`-related cleanups 4/7] Make the distinction between root build directory vs test suite specific build directory in compiletest less confusing) - rust-lang#136579 (Fix UB in ThinVec::flat_map_in_place) - rust-lang#136688 (require trait impls to have matching const stabilities as the traits) - rust-lang#136846 (Make `AssocOp` more like `ExprKind`) - rust-lang#137304 (add `IntoBounds::intersect` and `RangeBounds::is_empty`) - rust-lang#137455 (Reuse machinery from `tail_expr_drop_order` for `if_let_rescope`) - rust-lang#137480 (Return unexpected termination error instead of panicing in `Thread::join`) - rust-lang#137694 (Spruce up `AttributeKind` docs) r? `@ghost` `@rustbot` modify labels: rollup

[`compiletest`-related cleanups 4/7] Make the distinction between root build directory vs test suite specific build directory in compiletest less confusing Reference for overall changes: rust-lang#136437 Part **4** of **7** of the *`compiletest`-related cleanups* PR series. ### Summary - Remove `--build-base` compiletest flag, and introduce `--build-{root,test-suite-root}` flags instead. `--build-base` previously actually is test suite specific build directory, not the root `build/` directory. - Feed the root build directory directly from bootstrap to compiletest via `--build-root` instead of doing multiple layers of parent unwrapping[^parent] based on the test suite specific build directory. - Remove a redundant `to_path_buf()`. [^parent]: Please do not unwrap the parents. r? bootstrap

Rollup of 4 pull requests Successful merges: - rust-lang#136542 ([`compiletest`-related cleanups 4/7] Make the distinction between root build directory vs test suite specific build directory in compiletest less confusing) - rust-lang#136688 (require trait impls to have matching const stabilities as the traits) - rust-lang#136846 (Make `AssocOp` more like `ExprKind`) - rust-lang#137304 (add `IntoBounds::intersect` and `RangeBounds::is_empty`) r? `@ghost` `@rustbot` modify labels: rollup try-job: i686-msvc-1

…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#136542 ([`compiletest`-related cleanups 4/7] Make the distinction between root build directory vs test suite specific build directory in compiletest less confusing) - rust-lang#136579 (Fix UB in ThinVec::flat_map_in_place) - rust-lang#136688 (require trait impls to have matching const stabilities as the traits) - rust-lang#136846 (Make `AssocOp` more like `ExprKind`) - rust-lang#137304 (add `IntoBounds::intersect` and `RangeBounds::is_empty`) - rust-lang#137455 (Reuse machinery from `tail_expr_drop_order` for `if_let_rescope`) - rust-lang#137480 (Return unexpected termination error instead of panicing in `Thread::join`) - rust-lang#137694 (Spruce up `AttributeKind` docs) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#136542 - jieyouxu:build-base, r=onur-ozkan [`compiletest`-related cleanups 4/7] Make the distinction between root build directory vs test suite specific build directory in compiletest less confusing Reference for overall changes: rust-lang#136437 Part **4** of **7** of the *`compiletest`-related cleanups* PR series. ### Summary - Remove `--build-base` compiletest flag, and introduce `--build-{root,test-suite-root}` flags instead. `--build-base` previously actually is test suite specific build directory, not the root `build/` directory. - Feed the root build directory directly from bootstrap to compiletest via `--build-root` instead of doing multiple layers of parent unwrapping[^parent] based on the test suite specific build directory. - Remove a redundant `to_path_buf()`. [^parent]: Please do not unwrap the parents. r? bootstrap

rustbot assigned onur-ozkan Feb 4, 2025

rustbot added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 4, 2025

jieyouxu force-pushed the build-base branch from 043f857 to 5755da3 Compare February 4, 2025 14:14

This was referenced Feb 4, 2025

[DO NOT LOOK] a bunch of compiletest-related changes #136437

Closed

adding autodiff tests #136419

Merged

compiletest: compare-mode false negatives w.r.t. long type file path #136510

Closed

Retire the legacy Makefile-based run-make test infra #136581

Merged

jieyouxu force-pushed the build-base branch from 5755da3 to d3eb107 Compare February 10, 2025 16:03

jieyouxu mentioned this pull request Feb 11, 2025

Perform deeper compiletest path normalization for $TEST_BUILD_DIR to account for compare-mode/debugger cases, and normalize long type file filename hashes #136865

Merged

jieyouxu mentioned this pull request Feb 19, 2025

Making compiletest more maintainable: reworking directive handling rust-lang/rust-project-goals#259

Closed

5 tasks

jieyouxu added 3 commits February 23, 2025 21:47

compiletest: disambiguate between root build dir vs test suite specif…

5d6a6e7

…ic build dir - Introduce and use `--build-{root,test-suite-root}` over `--build-base`. - A few minor cleanups.

bootstrap: remove --build-base and use --build-root and `--build-…

5238337

…test-suite-root` instead

bootstrap: remove redundant to_path_buf()

7d2e4e4

jieyouxu force-pushed the build-base branch from d3eb107 to 7d2e4e4 Compare February 23, 2025 13:47

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-blocked Status: Blocked on something else such as an RFC or other implementation work. labels Feb 23, 2025

onur-ozkan approved these changes Feb 26, 2025

View reviewed changes

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 26, 2025

This was referenced Feb 27, 2025

Rollup of 7 pull requests #137709

Closed

Rollup of 8 pull requests #137710

Merged

matthiaskrgr mentioned this pull request Feb 27, 2025

Rollup of 4 pull requests #137716

Closed

lqd mentioned this pull request Feb 27, 2025

Raw comments rust-lang/rust-project-goals#298

Merged

bors merged commit f435138 into rust-lang:master Feb 28, 2025
6 checks passed

rustbot added this to the 1.87.0 milestone Feb 28, 2025

jieyouxu deleted the build-base branch February 28, 2025 09:01

jieyouxu mentioned this pull request Feb 28, 2025

Compile run-make-support and run-make tests with the bootstrap compiler #137373

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[`compiletest`-related cleanups 4/7] Make the distinction between root build directory vs test suite specific build directory in compiletest less confusing#136542

[`compiletest`-related cleanups 4/7] Make the distinction between root build directory vs test suite specific build directory in compiletest less confusing#136542
bors merged 3 commits intorust-lang:masterfrom
jieyouxu:build-base

jieyouxu commented Feb 4, 2025 •

edited

Loading

Uh oh!

jieyouxu commented Feb 4, 2025

Uh oh!

bors commented Feb 10, 2025

Uh oh!

bors commented Feb 22, 2025

Uh oh!

jieyouxu commented Feb 23, 2025

Uh oh!

onur-ozkan left a comment

Uh oh!

onur-ozkan commented Feb 26, 2025

Uh oh!

bors commented Feb 26, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Uh oh!

Conversation

jieyouxu commented Feb 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Footnotes

Uh oh!

jieyouxu commented Feb 4, 2025

Uh oh!

bors commented Feb 10, 2025

Uh oh!

bors commented Feb 22, 2025

Uh oh!

jieyouxu commented Feb 23, 2025

Uh oh!

onur-ozkan left a comment

Choose a reason for hiding this comment

Uh oh!

onur-ozkan commented Feb 26, 2025

Uh oh!

bors commented Feb 26, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

jieyouxu commented Feb 4, 2025 •

edited

Loading