improvements on `build_steps::test` implementation by onur-ozkan · Pull Request #135887 · rust-lang/rust

onur-ozkan · 2025-01-22T16:51:05Z

Reviewing commits one-by-one should make it easier to understand.

Signed-off-by: onur-ozkan <work@onurozkan.dev>

rustbot · 2025-01-22T16:51:15Z

rustbot has assigned @Mark-Simulacrum.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

rustbot · 2025-01-22T16:51:18Z

This PR modifies src/bootstrap/src/core/config.

If appropriate, please update CONFIG_CHANGE_HISTORY in src/bootstrap/src/utils/change_tracker.rs.

onur-ozkan · 2025-01-22T16:59:51Z

src/bootstrap/src/core/build_steps/test.rs

-        if let Some(flags) = option_env!("RUSTFLAGS") {
-            // Use the same rustc flags for testing as for "normal" compilation,
-            // so that Cargo doesn’t recompile the entire dependency graph every time:
-            // https://github.com/rust-lang/rust/issues/49215
-            cmd.env("RUSTFLAGS", flags);
-        }


Note: this is already handled from Cargo with

rust/src/bootstrap/src/core/builder/cargo.rs

Lines 27 to 31 in b2728d5

fn new(target: TargetSelection) -> Rustflags {

let mut ret = Rustflags(String::new(), target);

ret.propagate_cargo_env("RUSTFLAGS");

ret

}

onur-ozkan · 2025-01-22T17:03:23Z

src/bootstrap/src/core/config/tests.rs

            // `{build-dir}` can be anywhere, not just in the rust project directory.
            let dep = Path::new(args.first().unwrap());
-            let expected_out = dep.ancestors().nth(4).unwrap();
+            let expected_out = dep.ancestors().nth(5).unwrap();


Output path now also includes the host triple as bootstrap passes that regardless even for non-cross builds

rust/src/bootstrap/src/core/builder/cargo.rs

Lines 415 to 416 in b2728d5

if cmd_kind != Kind::Install {

cargo.arg("--target").arg(target.rustc_target_arg());

jieyouxu

Thanks, this is a nice cleanup. I tried some basic sanity checks like ./x test bootstrap and ./x test run-make-support, and they behaved as expected.

jieyouxu · 2025-01-23T06:00:34Z

@bors r+ rollup

bors · 2025-01-23T06:00:37Z

📌 Commit e3a5314 has been approved by jieyouxu

It is now in the queue for this repository.

…=jieyouxu improvements on `build_steps::test` implementation Reviewing commits one-by-one should make it easier to understand.

Rollup of 10 pull requests Successful merges: - rust-lang#134746 (Don't ICE in coerce when autoderef fails to structurally normalize non-WF type in new solver) - rust-lang#135552 ([AIX] Lint on structs that have a different alignment in AIX's C ABI) - rust-lang#135764 (Fix tests on LLVM 20) - rust-lang#135779 (CI: free disk on linux arm runner) - rust-lang#135790 (Update windows-gnu targets to set `DebuginfoKind::DWARF`) - rust-lang#135879 (fix outdated file path ref in llvm) - rust-lang#135883 (Remove erroneous `unsafe` in `BTreeSet::upper_bound_mut`) - rust-lang#135884 (remove implied end of slice) - rust-lang#135887 (improvements on `build_steps::test` implementation) - rust-lang#135898 (rustdoc-json-types: Finalize dyn compatibility renaming) r? `@ghost` `@rustbot` modify labels: rollup

…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#134746 (Don't ICE in coerce when autoderef fails to structurally normalize non-WF type in new solver) - rust-lang#135552 ([AIX] Lint on structs that have a different alignment in AIX's C ABI) - rust-lang#135779 (CI: free disk on linux arm runner) - rust-lang#135790 (Update windows-gnu targets to set `DebuginfoKind::DWARF`) - rust-lang#135879 (fix outdated file path ref in llvm) - rust-lang#135883 (Remove erroneous `unsafe` in `BTreeSet::upper_bound_mut`) - rust-lang#135884 (remove implied end of slice) - rust-lang#135887 (improvements on `build_steps::test` implementation) - rust-lang#135898 (rustdoc-json-types: Finalize dyn compatibility renaming) r? `@ghost` `@rustbot` modify labels: rollup

onur-ozkan added 3 commits January 22, 2025 19:36

make bootstrap self test to use bootstrap cargo

c568da9

Signed-off-by: onur-ozkan <work@onurozkan.dev>

resolve clippy FIXME

17b2ede

Signed-off-by: onur-ozkan <work@onurozkan.dev>

reduce number of prepare_cargo_test args

e3a5314

Signed-off-by: onur-ozkan <work@onurozkan.dev>

rustbot assigned Mark-Simulacrum Jan 22, 2025

rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Jan 22, 2025

onur-ozkan commented Jan 22, 2025

View reviewed changes

jieyouxu self-assigned this Jan 23, 2025

jieyouxu approved these changes Jan 23, 2025

View reviewed changes

jieyouxu unassigned Mark-Simulacrum Jan 23, 2025

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 Jan 23, 2025

jhpratt mentioned this pull request Jan 23, 2025

Rollup of 10 pull requests #135915

Closed

matthiaskrgr mentioned this pull request Jan 23, 2025

Rollup of 9 pull requests #135921

Merged

bors merged commit 76e68cc into rust-lang:master Jan 23, 2025
6 checks passed

rustbot added this to the 1.86.0 milestone Jan 23, 2025

onur-ozkan deleted the testing-improvements branch January 23, 2025 18:11

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

improvements on `build_steps::test` implementation#135887

improvements on `build_steps::test` implementation#135887
bors merged 3 commits intorust-lang:masterfrom
onur-ozkan:testing-improvements

onur-ozkan commented Jan 22, 2025

Uh oh!

rustbot commented Jan 22, 2025

Uh oh!

rustbot commented Jan 22, 2025

Uh oh!

onur-ozkan Jan 22, 2025

Uh oh!

onur-ozkan Jan 22, 2025

Uh oh!

jieyouxu left a comment •

edited

Loading

Uh oh!

jieyouxu commented Jan 23, 2025

Uh oh!

bors commented Jan 23, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

	fn new(target: TargetSelection) -> Rustflags {
	let mut ret = Rustflags(String::new(), target);
	ret.propagate_cargo_env("RUSTFLAGS");
	ret
	}

	if cmd_kind != Kind::Install {
	cargo.arg("--target").arg(target.rustc_target_arg());

Uh oh!

Conversation

onur-ozkan commented Jan 22, 2025

Uh oh!

rustbot commented Jan 22, 2025

Uh oh!

rustbot commented Jan 22, 2025

Uh oh!

onur-ozkan Jan 22, 2025

Choose a reason for hiding this comment

Uh oh!

onur-ozkan Jan 22, 2025

Choose a reason for hiding this comment

Uh oh!

jieyouxu left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jieyouxu commented Jan 23, 2025

Uh oh!

bors commented Jan 23, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

jieyouxu left a comment •

edited

Loading