Rewrite `suspicious-library`, `resolve-rename` and `incr-prev-body-beyond-eof` `run-make` tests in `rmake.rs` format #125683

Oneirical · 2024-05-28T19:55:38Z

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

Some oddly specific ignore flags in incr-prev-body-beyond-eof:

// ignore-none
// ignore-nvptx64-nvidia-cuda

it could be interesting to run a try job, but it seems there is no nvidia-cuda in the CI settings (jobs.yml).

try-job: armhf-gnu

rustbot · 2024-05-28T19:55:45Z

r? @jieyouxu

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

rustbot · 2024-05-28T19:55:47Z

The run-make-support library was changed

cc @jieyouxu

Some changes occurred in run-make tests.

cc @jieyouxu

tests/run-make/incr-prev-body-beyond-eof/rmake.rs

tests/run-make/suspicious-library/rmake.rs

jieyouxu · 2024-05-28T22:59:59Z

@rustbot author

Kobzol · 2024-05-29T07:17:01Z

tests/run-make/incr-prev-body-beyond-eof/rmake.rs

+        .run();
+    fs::copy("b.rs", tmp_dir().join("main.rs"));
+    rustc()
+        .incremental(tmp_dir().join("incr"))


The tmp_dir().join(...) pattern seems to be repeating quite often. It could be worth it to introduce something like fn tmp_path(path: &str) to simplify it, it's a bit hard to read.

I think we should add a helper, but in a separate PR (unrelated changes), I think it's fine for this PR to keep the join for now, I'll send another PR, so this PR can either rebase on top of that or I'll update the other PR to cover join in this PR too.

tests/run-make/incr-prev-body-beyond-eof/rmake.rs

Oneirical · 2024-05-29T15:49:45Z

Changes made, keeping things as minimal as possible (unwrap() and just adding the missing run()). However, the points brought up (#[must_use] tags and tmp_path functions) would be very nice. I often have to check that I put my run() everywhere and it's so easy to forget.
@rustbot review

Kobzol · 2024-05-29T15:51:57Z

@bors review

I think that you might have meant @rustbot ready 😅

jieyouxu · 2024-05-29T16:00:01Z

@bors review

I think that you might have meant @rustbot ready 😅

I derailed this PR by writing @bors author and being confused for 2 minutes why nothing is happening... I wish bors produced a warning message on unrecognized command :3

jieyouxu

I have some questions for the beyond-eof test

tests/run-make/incr-prev-body-beyond-eof/Makefile

Kobzol · 2024-06-01T12:24:06Z

(Added armhf-gnu to try jobs on this PR, so that we can test a potential fix in a try job.)

Oneirical · 2024-06-04T19:05:28Z

Looked up some past instances of this error, and found #28924.

The issue seems to be related to using the incorrect linker for the armhf-gnu platform, caused by --target $(TARGET).

As an experiment, I removed the --target flags. Why were they there in the first place? They don't seem linked to what the test does, and the purpose of --target is to compile for a platform that isn't the $(TARGET), is it not?

If that's not acceptable, it might be interesting to add a conditional check to set the appropriate linker for each failing architecture.

Running a try job once CI is green.

Oneirical · 2024-06-04T20:40:04Z

@bors try

bors · 2024-06-04T20:41:16Z

⌛ Trying commit 59e2074 with merge ba0d297...

…try> Rewrite `suspicious-library`, `resolve-rename` and `incr-prev-body-beyond-eof` `run-make` tests in `rmake.rs` format 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). Some oddly specific ignore flags in `incr-prev-body-beyond-eof`: ```rs // ignore-none // ignore-nvptx64-nvidia-cuda ``` it could be interesting to run a try job, but it seems there is no nvidia-cuda in the CI settings (`jobs.yml`). try-job: armhf-gnu

bors · 2024-06-04T21:38:27Z

☀️ Try build successful - checks-actions
Build commit: ba0d297 (ba0d29759bc7ed6a809a44d0df52d68077160c0b)

Oneirical · 2024-06-05T01:11:07Z

@rustbot review

Seems to be working, let me know if removing --target was unwise.

jieyouxu · 2024-06-05T04:43:44Z

As an experiment, I removed the --target flags. Why were they there in the first place? They don't seem linked to what the test does, and the purpose of --target is to compile for a platform that isn't the $(TARGET), is it not?

It would matter if the test artifacts are being cross-compiled and ran on a different target. For the purposes of this test, I think we could add a //@ ignore-cross-compile if it causes any issues because I feel like we're not really testing cross-compilation here.

jieyouxu · 2024-06-05T04:44:42Z

Good work! @bors r+ rollup

bors · 2024-06-05T04:44:44Z

📌 Commit 59e2074 has been approved by jieyouxu

It is now in the queue for this repository.

bors · 2024-06-05T04:44:45Z

🌲 The tree is currently closed for pull requests below priority 101. This pull request will be tested once the tree is reopened.

workingjubilee · 2024-06-05T07:57:51Z

mmmm gonna have to disagree here
@bors rollup=iffy

…kingjubilee Rollup of 12 pull requests Successful merges: - rust-lang#123168 (Add `size_of` and `size_of_val` and `align_of` and `align_of_val` to the prelude) - rust-lang#125273 (bootstrap: implement new feature `bootstrap-self-test`) - rust-lang#125683 (Rewrite `suspicious-library`, `resolve-rename` and `incr-prev-body-beyond-eof` `run-make` tests in `rmake.rs` format) - rust-lang#125815 (`rustc_parse` top-level cleanups) - rust-lang#125903 (rustc_span: Inline some hot functions) - rust-lang#125906 (Remove a bunch of redundant args from `report_method_error`) - rust-lang#125920 (Allow static mut definitions with #[linkage]) - rust-lang#125982 (Make deleting on LinkedList aware of the allocator) - rust-lang#125995 (Use inline const blocks to create arrays of `MaybeUninit`.) - rust-lang#125996 (Closures are recursively reachable) - rust-lang#126003 (Add a co-maintainer for the two ARMv4T targets) - rust-lang#126004 (Add another test for hidden types capturing lifetimes that outlive but arent mentioned in substs) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#125683 - Oneirical:patience-testing-test, r=jieyouxu Rewrite `suspicious-library`, `resolve-rename` and `incr-prev-body-beyond-eof` `run-make` tests in `rmake.rs` format 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). Some oddly specific ignore flags in `incr-prev-body-beyond-eof`: ```rs // ignore-none // ignore-nvptx64-nvidia-cuda ``` it could be interesting to run a try job, but it seems there is no nvidia-cuda in the CI settings (`jobs.yml`). try-job: armhf-gnu

Oneirical added 2 commits May 28, 2024 14:37

rewrite resolve-rename in rmake

b4834a1

rewrite incr-prev-body-beyond-eof in rmake

d553d5b

rustbot assigned jieyouxu May 28, 2024

rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc 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 May 28, 2024

This comment has been minimized.

Sign in to view

Oneirical force-pushed the patience-testing-test branch from f84464a to 5beff79 Compare May 28, 2024 20:52

This comment has been minimized.

Sign in to view

jieyouxu reviewed May 28, 2024

View reviewed changes

tests/run-make/incr-prev-body-beyond-eof/rmake.rs Outdated Show resolved Hide resolved

tests/run-make/suspicious-library/rmake.rs Outdated Show resolved Hide resolved

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 May 28, 2024

Kobzol reviewed May 29, 2024

View reviewed changes

Oneirical force-pushed the patience-testing-test branch 2 times, most recently from cd21022 to a24ac15 Compare May 29, 2024 15:46

Oneirical force-pushed the patience-testing-test branch from a24ac15 to 72683f6 Compare May 29, 2024 15:50

jieyouxu mentioned this pull request May 29, 2024

run-make-support: add helpers for fs operations #125728

Closed

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 May 29, 2024

This comment has been minimized.

Sign in to view

Oneirical force-pushed the patience-testing-test branch from 72683f6 to 51d1593 Compare May 29, 2024 17:08

jieyouxu reviewed May 29, 2024

View reviewed changes

tests/run-make/incr-prev-body-beyond-eof/Makefile Show resolved Hide resolved

tests/run-make/incr-prev-body-beyond-eof/Makefile Show resolved Hide resolved

Oneirical force-pushed the patience-testing-test branch from 51d1593 to db07d8b Compare May 29, 2024 19:48

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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 1, 2024

Oneirical force-pushed the patience-testing-test branch from a9f8f7d to 9bfd028 Compare June 4, 2024 19:03

This comment has been minimized.

Sign in to view

rewrite suspicious-library in rmake

59e2074

Oneirical force-pushed the patience-testing-test branch from 9bfd028 to 59e2074 Compare June 4, 2024 19:27

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

jieyouxu approved these changes Jun 5, 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 5, 2024

workingjubilee mentioned this pull request Jun 5, 2024

Rollup of 12 pull requests #126016

Merged

bors merged commit 0f2b34a into rust-lang:master Jun 5, 2024
7 checks passed

rustbot added this to the 1.80.0 milestone Jun 5, 2024

Oneirical deleted the patience-testing-test branch June 5, 2024 14:20

jieyouxu mentioned this pull request Jun 9, 2024

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

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rewrite `suspicious-library`, `resolve-rename` and `incr-prev-body-beyond-eof` `run-make` tests in `rmake.rs` format #125683

Rewrite `suspicious-library`, `resolve-rename` and `incr-prev-body-beyond-eof` `run-make` tests in `rmake.rs` format #125683

Oneirical commented May 28, 2024 •

edited by Kobzol

Loading

rustbot commented May 28, 2024

rustbot commented May 28, 2024

This comment has been minimized.

This comment has been minimized.

jieyouxu commented May 28, 2024

Kobzol May 29, 2024

jieyouxu May 29, 2024

Oneirical commented May 29, 2024 •

edited

Loading

Kobzol commented May 29, 2024

jieyouxu commented May 29, 2024

This comment has been minimized.

jieyouxu left a comment

This comment has been minimized.

Kobzol commented Jun 1, 2024

Oneirical commented Jun 4, 2024 •

edited

Loading

This comment has been minimized.

Oneirical commented Jun 4, 2024

bors commented Jun 4, 2024

bors commented Jun 4, 2024

Oneirical commented Jun 5, 2024

jieyouxu commented Jun 5, 2024

jieyouxu commented Jun 5, 2024

bors commented Jun 5, 2024

bors commented Jun 5, 2024

workingjubilee commented Jun 5, 2024

Rewrite suspicious-library, resolve-rename and incr-prev-body-beyond-eof run-make tests in rmake.rs format #125683

Rewrite suspicious-library, resolve-rename and incr-prev-body-beyond-eof run-make tests in rmake.rs format #125683

Conversation

Oneirical commented May 28, 2024 • edited by Kobzol Loading

rustbot commented May 28, 2024

rustbot commented May 28, 2024

This comment has been minimized.

This comment has been minimized.

jieyouxu commented May 28, 2024

Kobzol May 29, 2024

Choose a reason for hiding this comment

jieyouxu May 29, 2024

Choose a reason for hiding this comment

Oneirical commented May 29, 2024 • edited Loading

Kobzol commented May 29, 2024

jieyouxu commented May 29, 2024

This comment has been minimized.

jieyouxu left a comment

Choose a reason for hiding this comment

This comment has been minimized.

Kobzol commented Jun 1, 2024

Oneirical commented Jun 4, 2024 • edited Loading

This comment has been minimized.

Oneirical commented Jun 4, 2024

bors commented Jun 4, 2024

bors commented Jun 4, 2024

Oneirical commented Jun 5, 2024

jieyouxu commented Jun 5, 2024

jieyouxu commented Jun 5, 2024

bors commented Jun 5, 2024

bors commented Jun 5, 2024

workingjubilee commented Jun 5, 2024

Rewrite `suspicious-library`, `resolve-rename` and `incr-prev-body-beyond-eof` `run-make` tests in `rmake.rs` format #125683

Rewrite `suspicious-library`, `resolve-rename` and `incr-prev-body-beyond-eof` `run-make` tests in `rmake.rs` format #125683

Oneirical commented May 28, 2024 •

edited by Kobzol

Loading

Oneirical commented May 29, 2024 •

edited

Loading

Oneirical commented Jun 4, 2024 •

edited

Loading