Migrate `run-make/short-ice` to `rmake` #126036

Oneirical · 2024-06-05T16:17:55Z

Part of #121876 and the associated Google Summer of Code project.

try-job: x86_64-msvc

rustbot · 2024-06-05T16:18:03Z

rustbot has assigned @jieyouxu.
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

Noratrieb · 2024-06-05T19:59:36Z

tests/run-make/short-ice/rmake.rs

+        rust_test_log_1.lines().count() < rust_test_log_2.lines().count()
+            && count_lines_with(rust_test_log_2, "__rust_begin_short_backtrace")
+                == count_lines_with(rust_test_log_2, "__rust_end_short_backtrace")
+            && count_lines_with(rust_test_log_1, "rustc_query_") + 5 < rustc_query_count_full
+            && rustc_query_count_full > 5


just beautiful 🦀

tests/run-make/short-ice/rmake.rs

rustbot · 2024-06-08T20:00:08Z

Some changes occurred in run-make tests.

cc @jieyouxu

Kobzol · 2024-06-09T09:31:09Z

This will need a slight refactoring after #126121, sorry 😇

Kobzol · 2024-06-09T09:31:14Z

@rustbot author

Oneirical · 2024-06-09T17:51:54Z

This will need a slight refactoring after #126121, sorry 😇

Not a lot - since this test is merging together stderr and stdout, I don't think I could use the assert-related helper functions. Still got to add a few .stdout_utf8 and such, so that's nice!

@rustbot review

Oneirical · 2024-06-11T13:51:58Z

@rustbot review
This is probably ready to r+ again, unless we want to investigate the Windows failure more intently.

jieyouxu · 2024-06-11T14:01:31Z

tests/run-make/short-ice/rmake.rs

+        rust_test_log_1.lines().count() < rust_test_log_2.lines().count()
+            && count_lines_with(rust_test_log_2, "__rust_begin_short_backtrace")
+                == count_lines_with(rust_test_log_2, "__rust_end_short_backtrace")
+            && count_lines_with(rust_test_log_1, "rustc_query_") + 5 < rustc_query_count_full
+            && rustc_query_count_full > 5


Discussion: should we split this conjunction of multiple clauses into individual asserts, so that if the test does fail we have a chance to know which particular clause failed? I'm personally fine with the test still being //@ ignore-windows, but I would like to know more specificially about which clause causes the test to fail on Windows so we can leave a FIXME.

That's a very good idea, actually! I will now divide the assert, add a try job, and we can run that to see which one fails, and then restore the ignore.

jieyouxu · 2024-06-11T14:18:56Z

@bors delegate+ (so you can run try jobs, but please don't r+ yet until i take another look)

bors · 2024-06-11T14:18:59Z

✌️ @Oneirical, you can now approve this pull request!

If @jieyouxu told you to "r=me" after making some further change, please make that change, then do @bors r=@jieyouxu

Oneirical · 2024-06-11T17:39:36Z

@bors try

bors · 2024-06-11T17:40:47Z

⌛ Trying commit 2e4eff7 with merge 69acf76...

…r=<try> Migrate `run-make/short-ice` to `rmake` Part of rust-lang#121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html). try-job: x86_64-msvc

bors · 2024-06-11T19:11:54Z

💔 Test failed - checks-actions

Oneirical · 2024-06-11T19:40:50Z

Failed as expected. The assert_eq fails because of slight differences in how Windows outputs errors.

Ignore restored and reason added.

Oneirical · 2024-06-12T13:45:22Z

@rustbot review

jieyouxu · 2024-06-12T14:24:53Z

Thanks! @bors r+ rollup

bors · 2024-06-12T14:24:59Z

📌 Commit 8a6bc13 has been approved by jieyouxu

It is now in the queue for this repository.

…mpiler-errors Rollup of 8 pull requests Successful merges: - rust-lang#125869 (Add `target_env = "p1"` to the `wasm32-wasip1` target) - rust-lang#126019 (Add TODO comment to unsafe env modification) - rust-lang#126036 (Migrate `run-make/short-ice` to `rmake`) - rust-lang#126276 (Detect pub structs never constructed even though they impl pub trait with assoc constants) - rust-lang#126282 (Ensure self-contained linker is only enabled on dev/nightly ) - rust-lang#126317 (Avoid a bunch of booleans in favor of Result<(), ErrorGuaranteed> as that more robustly proves that an error has been emitted) - rust-lang#126324 (Adjust LoongArch64 data layouts for LLVM update) - rust-lang#126340 (Fix outdated predacates_of.rs comments) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#126036 - Oneirical:the-intelligent-intestor, r=jieyouxu Migrate `run-make/short-ice` to `rmake` Part of rust-lang#121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html). try-job: x86_64-msvc

rustbot assigned jieyouxu Jun 5, 2024

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

This comment has been minimized.

Sign in to view

Oneirical force-pushed the the-intelligent-intestor branch from ef4835f to 1e2253a Compare June 5, 2024 17:50

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

This comment has been minimized.

Sign in to view

Oneirical force-pushed the the-intelligent-intestor branch from 1e2253a to b65b0b5 Compare June 5, 2024 18:52

This comment has been minimized.

Sign in to view

Oneirical force-pushed the the-intelligent-intestor branch from b65b0b5 to fee9dcb Compare June 5, 2024 19:53

Noratrieb reviewed Jun 5, 2024

View reviewed changes

jieyouxu reviewed Jun 6, 2024

View reviewed changes

tests/run-make/short-ice/rmake.rs Outdated Show resolved Hide resolved

Oneirical force-pushed the the-intelligent-intestor branch 2 times, most recently from d49a7c8 to 824b088 Compare June 6, 2024 14:22

Kobzol reviewed Jun 8, 2024

View reviewed changes

tests/run-make/short-ice/rmake.rs Show resolved Hide resolved

Oneirical force-pushed the the-intelligent-intestor branch from 824b088 to 3cd6b48 Compare June 8, 2024 19:59

Oneirical marked this pull request as ready for review June 8, 2024 20:00

rustbot 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-review Status: Awaiting review from the assignee but also interested parties. labels Jun 9, 2024

jieyouxu mentioned this pull request Jun 9, 2024

Tracking Issue for porting run-make tests to use Rust #121876

Closed

Kobzol added the A-run-make Area: port run-make Makefiles to rmake.rs label Jun 9, 2024

rewrite short-ice in rmake format

f88c647

Oneirical force-pushed the the-intelligent-intestor branch from 3cd6b48 to f88c647 Compare June 9, 2024 17:50

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 9, 2024

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 11, 2024

jieyouxu reviewed Jun 11, 2024

View reviewed changes

Oneirical force-pushed the the-intelligent-intestor branch from 53639e9 to 2e4eff7 Compare June 11, 2024 14:15

This comment has been minimized.

Sign in to view

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-review Status: Awaiting review from the assignee but also interested parties. labels Jun 11, 2024

Add set_backtrace_level helper function to run_make_support

8a6bc13

Oneirical force-pushed the the-intelligent-intestor branch from 2e4eff7 to 8a6bc13 Compare June 11, 2024 19:40

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 12, 2024

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 12, 2024

compiler-errors mentioned this pull request Jun 12, 2024

Rollup of 8 pull requests #126345

Merged

bors merged commit d25227c into rust-lang:master Jun 12, 2024

rustbot added this to the 1.81.0 milestone Jun 12, 2024

Oneirical deleted the the-intelligent-intestor branch June 13, 2024 00:36

Uh oh!

Migrate run-make/short-ice to rmake #126036

Migrate run-make/short-ice to rmake #126036

Uh oh!

Conversation

Oneirical commented Jun 5, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Jun 5, 2024

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

Noratrieb Jun 5, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

rustbot commented Jun 8, 2024

Uh oh!

Kobzol commented Jun 9, 2024

Uh oh!

Kobzol commented Jun 9, 2024

Uh oh!

Oneirical commented Jun 9, 2024

Uh oh!

Oneirical commented Jun 11, 2024

Uh oh!

jieyouxu Jun 11, 2024

Choose a reason for hiding this comment

Uh oh!

Oneirical Jun 11, 2024

Choose a reason for hiding this comment

Uh oh!

jieyouxu commented Jun 11, 2024

Uh oh!

bors commented Jun 11, 2024

Uh oh!

Oneirical commented Jun 11, 2024

Uh oh!

bors commented Jun 11, 2024

Uh oh!

This comment has been minimized.

bors commented Jun 11, 2024

Uh oh!

Oneirical commented Jun 11, 2024

Uh oh!

Oneirical commented Jun 12, 2024

Uh oh!

jieyouxu commented Jun 12, 2024

Uh oh!

bors commented Jun 12, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

Migrate `run-make/short-ice` to `rmake` #126036

Migrate `run-make/short-ice` to `rmake` #126036

Oneirical commented Jun 5, 2024 •

edited

Loading