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

GuillaumeGomez · 2024-05-06T16:20:07Z

Part of #121876.

r? @jieyouxu

try-job: armhf-gnu

rustbot · 2024-05-06T16:20:15Z

Some changes occurred in run-make tests.

cc @jieyouxu

tests/run-make/rustdoc-io-error/rmake.rs

jieyouxu · 2024-05-08T14:37:34Z

tests/run-make/rustdoc-io-error/rmake.rs

+    permissions.set_readonly(false);
+    fs::set_permissions(&out_dir, permissions).unwrap();
+
+    #[cfg(not(windows))]


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?

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.

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

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

GuillaumeGomez · 2024-05-08T15:03:27Z

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 · 2024-05-08T15:05:43Z

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 · 2024-05-08T22:12:18Z

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 · 2024-05-08T22:13:29Z

⌛ Trying commit 6a614ad with merge f88ce61...

…ror, r=<try> Migrate `run-make/rustdoc-io-error` to `rmake.rs` Part of rust-lang#121876. r? `@jieyouxu`

bors · 2024-05-08T23:51:14Z

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

GuillaumeGomez · 2024-05-09T07:21:44Z

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

@bors r=jieyouxu rollup

bors · 2024-05-09T07:21:47Z

📌 Commit 6a614ad has been approved by jieyouxu

It is now in the queue for this repository.

bors · 2024-05-09T09:28:07Z

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

GuillaumeGomez · 2024-05-10T08:42:01Z

Rebased.

@bors r=jieyouxu rollup

bors · 2024-05-10T08:42:03Z

📌 Commit ab1a67e has been approved by jieyouxu

It is now in the queue for this repository.

…error, r=jieyouxu Migrate `run-make/rustdoc-io-error` to `rmake.rs` Part of rust-lang#121876. r? `@jieyouxu`

GuillaumeGomez · 2024-06-18T21:30:16Z

Updated!

jieyouxu

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

jieyouxu · 2024-06-19T17:30:52Z

@bors r+

bors · 2024-06-19T17:30:54Z

📌 Commit 1ba5c98 has been approved by jieyouxu

It is now in the queue for this repository.

jieyouxu · 2024-06-19T17:37:42Z

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

…error, r=jieyouxu Migrate `run-make/rustdoc-io-error` to `rmake.rs` Part of rust-lang#121876. r? `@jieyouxu` try-job: armhf-gnu

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 · 2024-06-19T22:18:39Z

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

jieyouxu · 2024-06-19T22:22:10Z

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

jieyouxu · 2024-06-19T22:24:45Z

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 · 2024-06-20T12:08:17Z

Ignored as well. Really dark magic...

jieyouxu · 2024-06-20T13:25:27Z

@bors r+ rollup=iffy

bors · 2024-06-20T13:25:30Z

📌 Commit b30ef41 has been approved by jieyouxu

It is now in the queue for this repository.

bors · 2024-06-20T16:09:17Z

⌛ Testing commit b30ef41 with merge cb8a7ea...

bors · 2024-06-20T18:19:54Z

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

rust-timer · 2024-06-20T19:36:47Z

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%)

rustbot assigned jieyouxu May 6, 2024

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

GuillaumeGomez force-pushed the migrate-rustdoc-io-error branch from 7a43b72 to 182fbf7 Compare May 6, 2024 16:20

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 reviewed May 8, 2024

View reviewed changes

tests/run-make/rustdoc-io-error/rmake.rs Show resolved Hide resolved

GuillaumeGomez force-pushed the migrate-rustdoc-io-error branch from 182fbf7 to 74475c9 Compare May 8, 2024 14:11

jieyouxu reviewed May 8, 2024

View reviewed changes

GuillaumeGomez force-pushed the migrate-rustdoc-io-error branch from 74475c9 to 6a614ad Compare May 8, 2024 15:02

bors added a commit to rust-lang-ci/rust that referenced this pull request May 8, 2024

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 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 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 force-pushed the migrate-rustdoc-io-error branch from 6a614ad to ab1a67e Compare May 10, 2024 08:41

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

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 mentioned this pull request May 10, 2024

Rollup of 4 pull requests #124964

Closed

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

1ba5c98

GuillaumeGomez force-pushed the migrate-rustdoc-io-error branch from c5bb1ac to 1ba5c98 Compare June 18, 2024 21:29

jieyouxu approved these changes Jun 18, 2024

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 Jun 19, 2024

jieyouxu mentioned this pull request Jun 19, 2024

Rollup of 7 pull requests #126710

Closed

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

Ignore arm targets as well for run-make/rustdoc-io-error tests

b30ef41

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 added the merged-by-bors This PR was explicitly merged by bors. label Jun 20, 2024

bors merged commit cb8a7ea into rust-lang:master Jun 20, 2024
7 checks passed

rustbot added this to the 1.81.0 milestone Jun 20, 2024

GuillaumeGomez deleted the migrate-rustdoc-io-error branch June 20, 2024 18:40

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

GuillaumeGomez commented May 6, 2024 •

edited

Loading

rustbot commented May 6, 2024

jieyouxu May 8, 2024

GuillaumeGomez May 8, 2024

jieyouxu May 8, 2024

GuillaumeGomez May 8, 2024

GuillaumeGomez commented May 8, 2024

jieyouxu commented May 8, 2024

GuillaumeGomez commented May 8, 2024

bors commented May 8, 2024

bors commented May 8, 2024

GuillaumeGomez commented May 9, 2024

bors commented May 9, 2024

bors commented May 9, 2024

GuillaumeGomez commented May 10, 2024

bors commented May 10, 2024

GuillaumeGomez commented Jun 18, 2024

jieyouxu left a comment

jieyouxu commented Jun 19, 2024

bors commented Jun 19, 2024

jieyouxu commented Jun 19, 2024

jieyouxu commented Jun 19, 2024

jieyouxu commented Jun 19, 2024

jieyouxu commented Jun 19, 2024 •

edited

Loading

GuillaumeGomez commented Jun 20, 2024

jieyouxu commented Jun 20, 2024

bors commented Jun 20, 2024

bors commented Jun 20, 2024

bors commented Jun 20, 2024

rust-timer commented Jun 20, 2024

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

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

Conversation

GuillaumeGomez commented May 6, 2024 • edited Loading

rustbot commented May 6, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

GuillaumeGomez commented May 8, 2024

jieyouxu commented May 8, 2024

GuillaumeGomez commented May 8, 2024

bors commented May 8, 2024

bors commented May 8, 2024

GuillaumeGomez commented May 9, 2024

bors commented May 9, 2024

bors commented May 9, 2024

GuillaumeGomez commented May 10, 2024

bors commented May 10, 2024

GuillaumeGomez commented Jun 18, 2024

jieyouxu left a comment

Choose a reason for hiding this comment

jieyouxu commented Jun 19, 2024

bors commented Jun 19, 2024

jieyouxu commented Jun 19, 2024

jieyouxu commented Jun 19, 2024

jieyouxu commented Jun 19, 2024

jieyouxu commented Jun 19, 2024 • edited Loading

GuillaumeGomez commented Jun 20, 2024

jieyouxu commented Jun 20, 2024

bors commented Jun 20, 2024

bors commented Jun 20, 2024

bors commented Jun 20, 2024

rust-timer commented Jun 20, 2024

Overall result: no relevant changes - no action needed

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

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

GuillaumeGomez commented May 6, 2024 •

edited

Loading

jieyouxu commented Jun 19, 2024 •

edited

Loading