Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Migrate run-make/rustdoc-io-error to rmake.rs #124807

Merged
merged 2 commits into from
Jun 20, 2024
Merged

Migrate run-make/rustdoc-io-error to rmake.rs #124807

merged 2 commits into from
Jun 20, 2024

Conversation

GuillaumeGomez
Copy link
Member

@GuillaumeGomez GuillaumeGomez commented May 6, 2024 •
edited
Loading

Part of #121876.

r? @jieyouxu

try-job: armhf-gnu

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 6, 2024
@rustbot
Copy link
Collaborator

rustbot commented May 6, 2024

Some changes occurred in run-make tests.

cc @jieyouxu

@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels May 6, 2024
jieyouxu
jieyouxu reviewed May 8, 2024
View reviewed changes
tests/run-make/rustdoc-io-error/rmake.rs Outdated
permissions.set_readonly(false);
fs::set_permissions(&out_dir, permissions).unwrap();

#[cfg(not(windows))]
Copy link
Member

Choose a reason for hiding this comment

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

Is there a reason assert_eq!(output.status.code().unwrap(), 1); is non-Windows? Basic r/w permissions are available on Windows too right? Does rustdoc behave differently on Windows for a non-modifiable output directory?

Copy link
Member Author

Choose a reason for hiding this comment

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

Because I couldn't ensure the exact error code value on Windows (I don't have windows) so for now I only check that it fails whatever the OS, and if it's unix, then I check the error code is 1.

Copy link
Member

Choose a reason for hiding this comment

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

You could try editing PR CI to enable some Windows runners in PR CI and see if the error code is the same on Windows

Copy link
Member Author

Choose a reason for hiding this comment

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

The original test was running fine on Windows so I suppose it's fine to just check the error code whatever the platform.

@GuillaumeGomez
Copy link
Member Author

Removed the cfg. As mentioned above, I think it'll be fine since the original test was checking for this error code and was running on windows as well.

@jieyouxu
Copy link
Member

jieyouxu commented May 8, 2024

Removed the cfg. As mentioned above, I think it'll be fine since the original test was checking for this error code and was running on windows as well.

Actually, the original test never ran on Windows 😄

rust/tests/run-make/rustdoc-io-error/Makefile

Line 7 in e3029d2

# ignore-windows

@GuillaumeGomez
Copy link
Member Author

Note for myself: should reduce coding while attending conferences. ^^'

Let's make a trybuild to ensure it's ok, and otherwise let's see what windows actually return.

@bors try

@bors
Copy link
Contributor

bors commented May 8, 2024

⌛ Trying commit 6a614ad with merge f88ce61...

bors added a commit to rust-lang-ci/rust that referenced this pull request May 8, 2024
@bors
Auto merge of rust-lang#124807 - GuillaumeGomez:migrate-rustdoc-io-er…
f88ce61 
…ror, r=<try>

Migrate `run-make/rustdoc-io-error` to `rmake.rs`

Part of rust-lang#121876.

r? `@jieyouxu`
@bors
Copy link
Contributor

bors commented May 8, 2024

☀️ Try build successful - checks-actions
Build commit: f88ce61 (f88ce618eb7b8dd4bb9a7d3614b26c544d2c10e1)

@GuillaumeGomez
Copy link
Member Author

Seems like windows is happy so let's go! :D

@bors r=jieyouxu rollup

@bors
Copy link
Contributor

bors commented May 9, 2024

📌 Commit 6a614ad has been approved by jieyouxu

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 May 9, 2024
@bors
Copy link
Contributor

bors commented May 9, 2024

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

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 9, 2024
@GuillaumeGomez
Copy link
Member Author

Rebased.

@bors r=jieyouxu rollup

@bors
Copy link
Contributor

bors commented May 10, 2024

📌 Commit ab1a67e has been approved by jieyouxu

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 10, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request May 10, 2024
@matthiaskrgr
Rollup merge of rust-lang#124807 - GuillaumeGomez:migrate-rustdoc-io-…
0a5dc82 
…error, r=jieyouxu

Migrate `run-make/rustdoc-io-error` to `rmake.rs`

Part of rust-lang#121876.

r? `@jieyouxu`
@matthiaskrgr matthiaskrgr mentioned this pull request May 10, 2024
Closed
@GuillaumeGomez
Copy link
Member Author

Updated!

jieyouxu
jieyouxu approved these changes Jun 18, 2024
View reviewed changes
Copy link
Member

@jieyouxu jieyouxu left a comment

Choose a reason for hiding this comment

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

Looks good! r=me after CI is green :3

@jieyouxu
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Jun 19, 2024

📌 Commit 1ba5c98 has been approved by jieyouxu

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 Jun 19, 2024
@jieyouxu
Copy link
Member

@bors rollup=iffy (downgrading because no longer running on windows)

jieyouxu added a commit to jieyouxu/rust that referenced this pull request Jun 19, 2024
@jieyouxu
Rollup merge of rust-lang#124807 - GuillaumeGomez:migrate-rustdoc-io-…
ce87f21 
…error, r=jieyouxu

Migrate `run-make/rustdoc-io-error` to `rmake.rs`

Part of rust-lang#121876.

r? `@jieyouxu`

try-job: armhf-gnu
@jieyouxu jieyouxu mentioned this pull request Jun 19, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 19, 2024
@bors
Auto merge of rust-lang#126710 - jieyouxu:rollup-3hmke71, r=jieyouxu
f2b449c 
Rollup of 7 pull requests

Successful merges:

 - rust-lang#124807 (Migrate `run-make/rustdoc-io-error` to `rmake.rs`)
 - rust-lang#126095 (Migrate `link-args-order`, `ls-metadata` and `lto-readonly-lib` `run-make` tests to `rmake`)
 - rust-lang#126308 (Ban `ArrayToPointer` and `MutToConstPointer` from runtime MIR)
 - rust-lang#126620 (Actually taint InferCtxt when a fulfillment error is emitted)
 - rust-lang#126629 (Migrate `run-make/compressed-debuginfo` to `rmake.rs`)
 - rust-lang#126644 (Rewrite `extern-flag-rename-transitive`. `debugger-visualizer-dep-info`, `metadata-flag-frobs-symbols`, `extern-overrides-distribution` and `forced-unwind-terminate-pof` `run-make` tests to rmake)
 - rust-lang#126650 (Rename a bunch of things in the new solver and `rustc_type_ir`)

r? `@ghost`
`@rustbot` modify labels: rollup
@jieyouxu
Copy link
Member

@bors r- (failed in #126710 (comment))

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 19, 2024
@jieyouxu
Copy link
Member

Hecc... I don't understand how this can pass on armhf-gnu when the original Makefile does not have an ignore for that 😅

@jieyouxu
Copy link
Member

jieyouxu commented Jun 19, 2024 •
edited
Loading

Judging from

rust/tests/ui/io-checks/non-ice-error-on-worker-io-fail.rs

Line 29 in d8a38b0

//@ ignore-arm - the file-system issues do not replicate here, at least on armhf-gnu
armhf-gnu fs perms is likely kinda weird... so I would be okay with slapping a //@ ignore-arm on this test with a "weird file perms on armhf-gnu" reason.

@GuillaumeGomez
Copy link
Member Author

Ignored as well. Really dark magic...

@jieyouxu
Copy link
Member

@bors r+ rollup=iffy

@bors
Copy link
Contributor

bors commented Jun 20, 2024

📌 Commit b30ef41 has been approved by jieyouxu

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 20, 2024
@bors
Copy link
Contributor

bors commented Jun 20, 2024

⌛ Testing commit b30ef41 with merge cb8a7ea...

@bors
Copy link
Contributor

bors commented Jun 20, 2024

☀️ Test successful - checks-actions
Approved by: jieyouxu
Pushing cb8a7ea to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 20, 2024
@bors bors merged commit cb8a7ea into rust-lang:master Jun 20, 2024
7 checks passed
@rustbot rustbot added this to the 1.81.0 milestone Jun 20, 2024
@GuillaumeGomez GuillaumeGomez deleted the migrate-rustdoc-io-error branch June 20, 2024 18:40
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (cb8a7ea): 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)

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

Cycles

Results (secondary -2.4%)

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

Binary size

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

Bootstrap: 692.671s -> 691.131s (-0.22%)
Artifact size: 323.74 MiB -> 323.75 MiB (0.00%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jieyouxu jieyouxu jieyouxu approved these changes

Assignees

@jieyouxu jieyouxu

Labels
A-run-make Area: port run-make Makefiles to rmake.rs A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. 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
Oxidizing run-make tests
Status: Done
Milestone
1.81.0
Development

Successfully merging this pull request may close these issues.