Migrate `std-core-cycle`, `obey-crate-type-flag`, `mixing-libs` and `issue-18943` `run-make` tests to `rmake.rs` #126484

Oneirical · 2024-06-14T16:10:16Z

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

try-job: x86_64-apple-1
try-job: x86_64-msvc
try-job: aarch64-gnu

rustbot · 2024-06-14T16:10:24Z

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-06-14T16:10:27Z

This PR modifies tests/run-make/. If this PR is trying to port a Makefile
run-make test to use rmake.rs, please update the
run-make port tracking issue
so we can track our progress. You can either modify the tracking issue
directly, or you can comment on the tracking issue and link this PR.

cc @jieyouxu

The run-make-support library was changed

cc @jieyouxu

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

tests/run-make/mixing-libs/rmake.rs

jieyouxu

Thanks for the PR. I have some concerns regarding the APIs and their implementation introduced in this PR that warrants further discussion, but the tests themselves look very reasonable.

src/tools/run-make-support/src/lib.rs

tests/run-make/lib-trait-for-trait-no-ice/rmake.rs

tests/run-make/mixing-libs/rmake.rs

tests/run-make/obey-crate-type-flag/rmake.rs

jieyouxu · 2024-06-16T21:17:21Z

I've also took the liberty to edit the PR description to include try jobs for apple (darwin), windows and linux for the std-core-cycle. This PR should be run on those try jobs before approval.

@bors rollup=iffy (the std-core-cycle looks platform-difference sensitive)

Oneirical · 2024-06-17T17:26:54Z

I have removed glob once more and removed all instances of remove_rlibs and associated functions. I only kept a new version of count_files_with_extension.

@rustbot review
Needs try job.

src/tools/run-make-support/src/lib.rs

jieyouxu · 2024-06-17T19:56:41Z

@bors delegate+ (for running try job, don't r+ just yet)

bors · 2024-06-17T19:56:44Z

✌️ @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

bors · 2024-07-03T23:48:11Z

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

Oneirical · 2024-07-05T15:07:59Z

@rustbot review

jieyouxu

Looks good, r=Kobzol and I after addressing the suggestions.

jieyouxu · 2024-07-06T05:24:12Z

tests/run-make/lib-trait-for-trait-no-ice/rmake.rs

+
+fn main() {
+    rustc().input("foo.rs").crate_type("lib").run();
+    fs_wrapper::remove_file(rust_lib_name("foo"));


Suggestion: this should be checking for existence of the lib file, not checking-by-proxy via trying to remove it I feel like?

jieyouxu · 2024-07-06T05:25:29Z

tests/run-make/obey-crate-type-flag/rmake.rs

+    fs_wrapper::remove_file(dynamic_lib_name("test"));
+    fs_wrapper::remove_file(rust_lib_name("test"));


Suggestion: ditto here about checking for existence, not checking-by-proxy via trying to remove file.

In this particular case, removing the rust lib is necessary for the final check to work, but to make it explicit, I made it so it checks existence then removes it. Even though the removal checks for existence, it should be clearer for the test reader.

Oneirical · 2024-07-16T13:36:04Z

Forgot to queue this one up.
@bors r=jieyouxu,kobzol

bors · 2024-07-16T13:36:07Z

📌 Commit cbc62cb has been approved by jieyouxu,kobzol

It is now in the queue for this repository.

bors · 2024-07-16T19:25:55Z

⌛ Testing commit cbc62cb with merge 032be6f...

bors · 2024-07-16T21:45:16Z

☀️ Test successful - checks-actions
Approved by: jieyouxu,kobzol
Pushing 032be6f to master...

rust-timer · 2024-07-16T23:31:11Z

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

Results (primary 7.1%)

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

Cycles

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

Binary size

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

Bootstrap: 699.147s -> 700.459s (0.19%)
Artifact size: 328.64 MiB -> 328.60 MiB (-0.02%)

rustbot assigned jieyouxu Jun 14, 2024

This comment has been minimized.

Sign in to view

Oneirical force-pushed the test-in-peace branch from e63e381 to 779f8af Compare June 14, 2024 16:55

Oneirical changed the title ~~Migrate std-core-cycle, obey-crate-type-flag and issue-18943 run-make tests to rmake.rs~~ Migrate std-core-cycle, obey-crate-type-flag, mixing-libs and issue-18943 run-make tests to rmake.rs Jun 14, 2024

Kobzol mentioned this pull request Jun 14, 2024

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

Open

fbstj reviewed Jun 14, 2024

View reviewed changes

tests/run-make/mixing-libs/rmake.rs Outdated Show resolved Hide resolved

Oneirical force-pushed the test-in-peace branch from 57621cb to 98ea1f7 Compare June 14, 2024 20:55

jieyouxu requested changes Jun 16, 2024

View reviewed changes

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 16, 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 17, 2024

jieyouxu reviewed Jun 17, 2024

View reviewed changes

src/tools/run-make-support/src/lib.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 Jun 17, 2024

Oneirical force-pushed the test-in-peace branch from 261197e to e72d3c6 Compare June 17, 2024 20:27

This comment has been minimized.

Sign in to view

Oneirical force-pushed the test-in-peace branch from e12a554 to 9324b98 Compare July 2, 2024 16:33

Oneirical force-pushed the test-in-peace branch 2 times, most recently from b2a7e20 to 3fe832d Compare July 5, 2024 14:14

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. labels Jul 5, 2024

jieyouxu approved these changes Jul 6, 2024

View reviewed changes

Oneirical force-pushed the test-in-peace branch from 3fe832d to f046e70 Compare July 8, 2024 13:57

Oneirical added 5 commits July 8, 2024 09:58

rewrite std-core-cycle to rmake

cf9e7a9

rewrite obey-crate-type-flag to rmake

2c7afc1

rewrite and rename issue-18943 to rmake

d9162fd

rewrite mixing-libs to rmake

ece7d98

shallow_find_files function for run_make_support

cbc62cb

Oneirical force-pushed the test-in-peace branch from f046e70 to cbc62cb Compare July 8, 2024 13:59

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

bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 16, 2024

bors merged commit 032be6f into rust-lang:master Jul 16, 2024
7 checks passed

rustbot added this to the 1.81.0 milestone Jul 16, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Migrate `std-core-cycle`, `obey-crate-type-flag`, `mixing-libs` and `issue-18943` `run-make` tests to `rmake.rs` #126484

Migrate `std-core-cycle`, `obey-crate-type-flag`, `mixing-libs` and `issue-18943` `run-make` tests to `rmake.rs` #126484

Oneirical commented Jun 14, 2024 •

edited by jieyouxu

Loading

rustbot commented Jun 14, 2024

rustbot commented Jun 14, 2024

This comment has been minimized.

jieyouxu left a comment

jieyouxu commented Jun 16, 2024 •

edited

Loading

Oneirical commented Jun 17, 2024 •

edited

Loading

jieyouxu commented Jun 17, 2024

bors commented Jun 17, 2024

This comment has been minimized.

bors commented Jul 3, 2024

Oneirical commented Jul 5, 2024

jieyouxu left a comment

jieyouxu Jul 6, 2024

jieyouxu Jul 6, 2024

Oneirical Jul 8, 2024

Oneirical commented Jul 16, 2024

bors commented Jul 16, 2024

bors commented Jul 16, 2024

bors commented Jul 16, 2024

rust-timer commented Jul 16, 2024

		fs_wrapper::remove_file(dynamic_lib_name("test"));
		fs_wrapper::remove_file(rust_lib_name("test"));

Migrate std-core-cycle, obey-crate-type-flag, mixing-libs and issue-18943 run-make tests to rmake.rs #126484

Migrate std-core-cycle, obey-crate-type-flag, mixing-libs and issue-18943 run-make tests to rmake.rs #126484

Conversation

Oneirical commented Jun 14, 2024 • edited by jieyouxu Loading

rustbot commented Jun 14, 2024

rustbot commented Jun 14, 2024

This comment has been minimized.

jieyouxu left a comment

Choose a reason for hiding this comment

jieyouxu commented Jun 16, 2024 • edited Loading

Oneirical commented Jun 17, 2024 • edited Loading

jieyouxu commented Jun 17, 2024

bors commented Jun 17, 2024

This comment has been minimized.

bors commented Jul 3, 2024

Oneirical commented Jul 5, 2024

jieyouxu left a comment

Choose a reason for hiding this comment

jieyouxu Jul 6, 2024

Choose a reason for hiding this comment

jieyouxu Jul 6, 2024

Choose a reason for hiding this comment

Oneirical Jul 8, 2024

Choose a reason for hiding this comment

Oneirical commented Jul 16, 2024

bors commented Jul 16, 2024

bors commented Jul 16, 2024

bors commented Jul 16, 2024

rust-timer commented Jul 16, 2024

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Migrate `std-core-cycle`, `obey-crate-type-flag`, `mixing-libs` and `issue-18943` `run-make` tests to `rmake.rs` #126484

Migrate `std-core-cycle`, `obey-crate-type-flag`, `mixing-libs` and `issue-18943` `run-make` tests to `rmake.rs` #126484

Oneirical commented Jun 14, 2024 •

edited by jieyouxu

Loading

jieyouxu commented Jun 16, 2024 •

edited

Loading

Oneirical commented Jun 17, 2024 •

edited

Loading