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 relro-levels, static-pie to rmake #126715

Merged
merged 6 commits into from
Jun 23, 2024
Merged

Migrate relro-levels, static-pie to rmake #126715

merged 6 commits into from
Jun 23, 2024

Conversation

Rejyr
Copy link
Contributor

@Rejyr Rejyr commented Jun 19, 2024 •
edited by jieyouxu
Loading

Part of #121876.

r? @jieyouxu

try-job: aarch64-gnu
try-job: arm-android
try-job: armhf-gnu
try-job: dist-i586-gnu-i586-i686-musl
try-job: dist-various-1
try-job: test-various

@rustbot rustbot added A-run-make Area: port run-make Makefiles to rmake.rs 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 Jun 19, 2024
@rustbot
Copy link
Collaborator

rustbot commented Jun 19, 2024

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

@jieyouxu
Copy link
Member

Hi @Rejyr thanks for the PR, note that #126698 already is taking on issue-68794-textrel-on-minimal-lib

Oneirical
Oneirical reviewed Jun 19, 2024
View reviewed changes
Copy link
Contributor

@Oneirical Oneirical left a comment •
edited
Loading

Choose a reason for hiding this comment

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

I left a comment about extra_c_flagsand extra_cxx_flags anyhow in issue-68794-textrel-on-minimal-lib as it may be useful to you in the future if you want to continue helping the test oxidization efforts!

tests/run-make/issue-68794-textrel-on-minimal-lib/rmake.rs Outdated Show resolved Hide resolved
tests/run-make/static-pie/rmake.rs Outdated Show resolved Hide resolved
tests/run-make/static-pie/rmake.rs Outdated Show resolved Hide resolved
@Rejyr Rejyr force-pushed the migrate-readelf-rmake branch from 24b5de8 to 9f8d584 Compare June 19, 2024 23:40
@Rejyr Rejyr changed the title Migrate relro-levels, issue-68794-textrel-on-minimal-lib, static-pie to rmake Migrate relro-levels, static-pie to rmake Jun 19, 2024
jieyouxu
jieyouxu reviewed Jun 19, 2024
View reviewed changes
tests/run-make/relro-levels/rmake.rs Outdated
@@ -0,0 +1,29 @@
// This tests the different -Crelro-level values, and makes sure that they work properly.

//@ ignore-cross-compile
Copy link
Member

Choose a reason for hiding this comment

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

Question: is ignoring cross-compilation load-bearing here? We can try to see if this test fails in cross-compiling CI jobs if you remove this for now.

Copy link
Member

Choose a reason for hiding this comment

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

Question: can you try removing this //@ ignore-cross-compile and we can run try jobs to check if that is needed.

tests/run-make/static-pie/Makefile Show resolved Hide resolved
tests/run-make/static-pie/rmake.rs Outdated
Comment on lines 30 to 57
.arg(format!("-Clinker={compiler}"))
.arg("-Clinker-flavor=gcc")
.arg("-Ctarget-feature=+crt-static")
Copy link
Member

Choose a reason for hiding this comment

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

Suggestion: we should add helpers for these to the support library if they don't already exist.

tests/run-make/static-pie/rmake.rs Outdated Show resolved Hide resolved
tests/run-make/static-pie/rmake.rs Outdated Show resolved Hide resolved
@jieyouxu jieyouxu mentioned this pull request Jun 19, 2024
Open
@Rejyr Rejyr force-pushed the migrate-readelf-rmake branch from 9f8d584 to 591bbf6 Compare June 19, 2024 23:45
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Rejyr Rejyr force-pushed the migrate-readelf-rmake branch from 4a93663 to f8c9a23 Compare June 20, 2024 14:05
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Jun 22, 2024

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

@Rejyr Rejyr force-pushed the migrate-readelf-rmake branch from f8c9a23 to 9128769 Compare June 22, 2024 15:48
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Rejyr Rejyr force-pushed the migrate-readelf-rmake branch from 9128769 to 39faece Compare June 22, 2024 16:53
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Rejyr Rejyr force-pushed the migrate-readelf-rmake branch from 2085157 to c69770d Compare June 22, 2024 18:21
@Rejyr
Copy link
Contributor Author

Rejyr commented Jun 22, 2024

@rustbot review

jieyouxu
jieyouxu approved these changes Jun 22, 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.

Thanks, looks overall good to me, just have two questions.

tests/run-make/relro-levels/rmake.rs Outdated
@@ -0,0 +1,29 @@
// This tests the different -Crelro-level values, and makes sure that they work properly.

//@ ignore-cross-compile
Copy link
Member

Choose a reason for hiding this comment

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

Question: can you try removing this //@ ignore-cross-compile and we can run try jobs to check if that is needed.

tests/run-make/static-pie/rmake.rs Show resolved Hide resolved
@jieyouxu
Copy link
Member

@bors try

@bors
Copy link
Contributor

bors commented Jun 23, 2024

⌛ Trying commit a19077d with merge 4ce7098...

bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 23, 2024
@bors
Auto merge of rust-lang#126715 - Rejyr:migrate-readelf-rmake, r=<try>
4ce7098 
Migrate `relro-levels`, `static-pie` to `rmake`

Part of rust-lang#121876.

r? `@jieyouxu`

try-job: aarch64-gnu
try-job: arm-android
try-job: armhf-gnu
try-job: dist-i586-gnu-i586-i686-musl
try-job: dist-various-1
try-job: test-various
@bors
Copy link
Contributor

bors commented Jun 23, 2024

☀️ Try build successful - checks-actions
Build commit: 4ce7098 (4ce7098fb86f9292d6ed645ccce3660c9d51c277)

@jieyouxu
Copy link
Member

In the long term I think we should hoist such C compiler detection to compiletest and then expose them to tests via specific env vars, but this is fine.

Thanks!
@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jun 23, 2024

📌 Commit a19077d 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 23, 2024
@bors
Copy link
Contributor

bors commented Jun 23, 2024

⌛ Testing commit a19077d with merge d4cc01c...

@bors
Copy link
Contributor

bors commented Jun 23, 2024

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 23, 2024
@bors bors merged commit d4cc01c into rust-lang:master Jun 23, 2024
7 checks passed
@rustbot rustbot added this to the 1.81.0 milestone Jun 23, 2024
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (d4cc01c): 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 (primary -2.6%)

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

Binary size

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

Bootstrap: 691.822s -> 692.678s (0.12%)
Artifact size: 326.81 MiB -> 326.70 MiB (-0.03%)

@Rejyr Rejyr deleted the migrate-readelf-rmake branch June 23, 2024 14:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Oneirical Oneirical Oneirical left review comments

@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.
7 participants
@Rejyr @rustbot @jieyouxu @rust-log-analyzer @bors @rust-timer @Oneirical