extend detect_src_and_out test

[onur-ozkan]

I was thinking about the following cases when I wrote the comment in #109055

1. Running bootstrap from the source root.
2. Running from a subdirectory of the source root.
3. Running from outside the source root.
4. Running on a different machine from where bootstrap was compiled (which will be important > for no python in shell scripts #107812). You can mostly replicate this by renaming the source root so it no longer exists on disk.
5. Running with --build-dir.
6. Running with $RUST_BOOTSTRAP_CONFIG set in the environment and build-dir set in the file.

Tested all the topics mentioned above. All worked fine. The test is now also covers if build dir is manually specified in config.

r? @jyn514

helps #109120 partially

[jyn514]

This change looks good to me, but I'm somewhat confused by the PR description? I only see tests for build-dir, not the other things mentioned in the issue.

Anyway, r=me on this change, but please remove "fixes" from the PR description if you want to merge it before I take another look.

[onur-ozkan]

This change looks good to me, but I'm somewhat confused by the PR description? I only see tests for build-dir, not the other things mentioned in the issue.

Anyway, r=me on this change

https://github.com/rust-lang/rust/blob/5f01f7bbd507641ccc83c63a8b7414ff00ca5356/src/bootstrap/config/tests.rs#L68-L76

This already covers first 4 topics you mentioned. I performed all the scenarios and test passed without any trouble.

but please remove "fixes" from the PR description if you want to merge it before I take another look.

You mean resolves #109120 part?

I will take another look and see if I can extend it even more.

[onur-ozkan]

1. Running bootstrap from the source root.
2. Running from a subdirectory of the source root.
3. Running from outside the source root.
4. Running on a different machine from where bootstrap was compiled (which will be important > for no python in shell scripts #107812). You can mostly replicate this by renaming the source root so it no longer exists on disk.

These should already be covered because we check build artifacts and environments that are being applied from bootstrap. So executing bootstrap from any directory or with any --build-dir shouldn't make difference.

5. Running with --build-dir.
6. Running with $RUST_BOOTSTRAP_CONFIG set in the environment and build-dir set in the file.

We have test for that

https://github.com/rust-lang/rust/blob/5f01f7bbd507641ccc83c63a8b7414ff00ca5356/src/bootstrap/config/tests.rs#L81

@jyn514 I am not sure how far this test can be extended, I guess you have so more ideas. Feel free to remove resolves part from PR description if you think this test can be extended more.

out of context: I extended testing src part a little more by adding CARGO_MANIFEST_DIR check.

[onur-ozkan]

@rustbot ready

[jyn514]

So executing bootstrap from any directory or with any --build-dir shouldn't make difference.

This is what makes me nervous - the test relies on being run in the scenarios I've mentioned to be effective (i.e. after your change x test bootstrap from outside the source root will only succeed if the src/out logic is correct). But CI never runs x test bootstrap from outside the source root. So this is still only catching issues once someone, usually a distro, sets a custom config. I would like to also change CI to run x test bootstrap in the scenarios I've mentioned.

Running on a different machine from where bootstrap was compiled (which will be important > for

This is definitely not being tested, expected_out and expected_src will both be incorrect if the CARGO_MANIFEST_DIR doesn't exist on disk.

[onur-ozkan]

@rustbot author

[onur-ozkan]

I currently have several Rust tasks assigned to me that take priority. As this version of the test is significantly better than the previous one, I would like to merge it to main and avoid blocking it from other tasks of mine. I have added a FIXME tag with my name on it, and I will return to improving this test at a later time, once I have finished the other tasks assigned to me.

r=me on this change, but please remove "fixes" from the PR description

Updated it.

@bors r=jyn514 rollup

[bors]

📌 Commit 38b1741 has been approved by jyn514

It is now in the queue for this repository.

[matthiaskrgr]

@bors r- failed in a rollup #110006

[onur-ozkan]

@bors r=jyn514 rollup

[bors]

📌 Commit 925a304 has been approved by jyn514

It is now in the queue for this repository.

[jyn514]

@bors rollup=iffy

[bors]

⌛ Testing commit 925a304 with merge 28a2928...

[bors]

☀️ Test successful - checks-actions
Approved by: jyn514
Pushing 28a2928 to master...

[rust-timer]

Finished benchmarking commit (28a2928): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-3.4%	[-3.4%, -3.4%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-3.4%	[-3.4%, -3.4%]	1

Cycles

This benchmark run did not return any relevant results for this metric.