Skip to content

Fix test panics for submodule of book is not updated #113965

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 23, 2023

Conversation

chenyukang
Copy link
Member

Fixes #113963

@rustbot
Copy link
Collaborator

rustbot commented Jul 22, 2023

r? @clubby789

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added 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 Jul 22, 2023
@onur-ozkan
Copy link
Member

This will not give the error(which it should give) if submodule was fetched but directory was corrupted/removed. Checking if submodule was fetched or not could be better option here.

@chenyukang chenyukang force-pushed the yukang-fix-113963-panic branch 2 times, most recently from 1c42446 to b711c84 Compare July 22, 2023 16:38
@chenyukang
Copy link
Member Author

updated the code to check the directory and exit(1) if checking failed.

@chenyukang chenyukang force-pushed the yukang-fix-113963-panic branch from b711c84 to ca9a20b Compare July 22, 2023 16:52
@rust-log-analyzer

This comment has been minimized.

@chenyukang chenyukang force-pushed the yukang-fix-113963-panic branch from ca9a20b to d46804c Compare July 22, 2023 16:53
Copy link
Member

@onur-ozkan onur-ozkan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the fix! Looks good to me.

Only 1 suggestion you may want to consider following it. r=me with/without it since it's not a blocker.

Comment on lines +200 to +206
let absolute_path = builder.src.join(&relative_path);
let redirect_path = absolute_path.join("redirects");
if !absolute_path.exists()
|| !redirect_path.exists()
|| dir_is_empty(&absolute_path)
|| dir_is_empty(&redirect_path)
{
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can create function something like fn is_submodule_checked_out(module_path: &str) -> bool that uses git submodule foreach command inside.

@chenyukang
Copy link
Member Author

@bors r=ozkanonur

@bors
Copy link
Collaborator

bors commented Jul 23, 2023

📌 Commit d46804c has been approved by ozkanonur

It is now in the queue for this repository.

@bors 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 Jul 23, 2023
@bors
Copy link
Collaborator

bors commented Jul 23, 2023

⌛ Testing commit d46804c with merge d9d80e2...

@bors
Copy link
Collaborator

bors commented Jul 23, 2023

☀️ Test successful - checks-actions
Approved by: ozkanonur
Pushing d9d80e2 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 23, 2023
@bors bors merged commit d9d80e2 into rust-lang:master Jul 23, 2023
@rustbot rustbot added this to the 1.73.0 milestone Jul 23, 2023
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (d9d80e2): comparison URL.

Overall result: ❌ regressions - ACTION NEEDED

Next Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please open an issue or create a new PR that fixes the regressions, add a comment linking to the newly created issue or PR, and then add the perf-regression-triaged label to this PR.

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
0.7% [0.7%, 0.8%] 4
Regressions ❌
(secondary)
0.5% [0.3%, 0.6%] 7
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.7% [0.7%, 0.8%] 4

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)
-2.2% [-2.2%, -2.2%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -2.2% [-2.2%, -2.2%] 1

Cycles

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)
- - 0
Improvements ✅
(secondary)
-3.5% [-3.5%, -3.5%] 1
All ❌✅ (primary) - - 0

Binary size

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

Bootstrap: 652.001s -> 651.923s (-0.01%)

@rustbot rustbot added the perf-regression Performance regression. label Jul 23, 2023
@rylev
Copy link
Member

rylev commented Aug 5, 2023

Perf: this is noise that is corrected in the next run.

@rustbot label: +perf-regression-triaged

@rustbot rustbot added the perf-regression-triaged The performance regression has been triaged. label Aug 5, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. perf-regression Performance regression. perf-regression-triaged The performance regression has been triaged. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

./x.py test panics
8 participants