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.

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

Migrate static-dylib-by-default, sanitizer-dylib-link, sanitizer-cdylib-link and sanitizer-staticlib-link run-make tests to rmake #128079

Merged
merged 4 commits into from
Jul 28, 2024

Conversation

Oneirical
Copy link
Contributor

@Oneirical Oneirical commented Jul 22, 2024

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

Please try:

try-job: x86_64-msvc
try-job: armhf-gnu
try-job: test-various
try-job: i686-msvc
try-job: x86_64-mingw
try-job: x86_64-gnu-llvm-18

@rustbot
Copy link
Collaborator

rustbot commented Jul 22, 2024

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 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 Jul 22, 2024
@rustbot
Copy link
Collaborator

rustbot commented Jul 22, 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

@bors
Copy link
Contributor

bors commented Jul 23, 2024

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

@jieyouxu
Copy link
Member

@bors delegate+ (for try jobs)

@bors
Copy link
Contributor

bors commented Jul 23, 2024

✌️ @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 Oneirical force-pushed the testiges-of-civilization branch from 07282e8 to 9abacec Compare July 23, 2024 14:26
@Oneirical
Copy link
Contributor Author

@bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 23, 2024
…r=<try>

Migrate `static-dylib-by-default`, `sanitizer-dylib-link`, `sanitizer-cdylib-link` and `sanitizer-staticlib-link` `run-make` tests 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).

Please try:

try-job: x86_64-msvc
@bors
Copy link
Contributor

bors commented Jul 23, 2024

⌛ Trying commit 9abacec with merge 1caa5b7...

@rust-log-analyzer

This comment has been minimized.

@bors
Copy link
Contributor

bors commented Jul 23, 2024

💔 Test failed - checks-actions

@bors 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 Jul 23, 2024
@Oneirical Oneirical force-pushed the testiges-of-civilization branch from 9abacec to 63adc36 Compare July 23, 2024 17:46
@Oneirical
Copy link
Contributor Author

let dylib = if is_msvc() { "bar.dll.lib" } else { &dynamic_lib_name("bar") };

Ugly hack, but worth seeing if it works. @bors try

@bors
Copy link
Contributor

bors commented Jul 23, 2024

⌛ Trying commit 63adc36 with merge 527f05c...

bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 23, 2024
…r=<try>

Migrate `static-dylib-by-default`, `sanitizer-dylib-link`, `sanitizer-cdylib-link` and `sanitizer-staticlib-link` `run-make` tests 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).

Please try:

try-job: x86_64-msvc
@bors
Copy link
Contributor

bors commented Jul 23, 2024

☀️ Try build successful - checks-actions
Build commit: 527f05c (527f05c32565e4bf6044f4fb900349238c17e728)

@Oneirical
Copy link
Contributor Author

@rustbot review

The hack is pretty ugly, but it's what the original test did. Tell me what you think @rustbot review

@rustbot 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 Jul 23, 2024
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, mostly LGTM now, just a question about whether we need either --target or ignore-cross-compile.

@jieyouxu
Copy link
Member

To help answer those questions, let's run a couple of try jobs to see if it might be a problem (it might still be, even if the edge case is not exercised in current CI jobs).

@bors try

@jieyouxu
Copy link
Member

@rustbot author

@rustbot 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 Jul 27, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 27, 2024
…r=<try>

Migrate `static-dylib-by-default`, `sanitizer-dylib-link`, `sanitizer-cdylib-link` and `sanitizer-staticlib-link` `run-make` tests 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).

Please try:

try-job: x86_64-msvc
try-job: armhf-gnu
try-job: test-various
try-job: i686-msvc
try-job: x86_64-mingw
try-job: x86_64-gnu-llvm-18
@bors
Copy link
Contributor

bors commented Jul 27, 2024

⌛ Trying commit 62fb491 with merge 062aefd...

@bors
Copy link
Contributor

bors commented Jul 27, 2024

☀️ Try build successful - checks-actions
Build commit: 062aefd (062aefdf0466a578ce483997691a92ebece26453)

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

@jieyouxu
Copy link
Member

@bors r+ rollup=iffy (sanitizer, linking, msvc specific behaviors, you name it)

@bors
Copy link
Contributor

bors commented Jul 27, 2024

📌 Commit 62fb491 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 27, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 27, 2024
…r=jieyouxu

Migrate `static-dylib-by-default`, `sanitizer-dylib-link`, `sanitizer-cdylib-link` and `sanitizer-staticlib-link` `run-make` tests 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).

Please try:

try-job: x86_64-msvc
try-job: armhf-gnu
try-job: test-various
try-job: i686-msvc
try-job: x86_64-mingw
try-job: x86_64-gnu-llvm-18
@bors
Copy link
Contributor

bors commented Jul 27, 2024

⌛ Testing commit 62fb491 with merge 7cb87cc...

@rust-log-analyzer
Copy link
Collaborator

The job x86_64-msvc-ext failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
    Finished `release` profile [optimized] target(s) in 0.38s
##[endgroup]
[TIMING] core::build_steps::tool::ToolBuild { compiler: Compiler { stage: 1, host: x86_64-pc-windows-msvc }, target: x86_64-pc-windows-msvc, tool: "miri", path: "src/tools/miri", mode: ToolRustc, source_type: InTree, extra_features: [], allow_features: "", cargo_args: [] } -- 0.422
thread 'main' panicked at src/lib.rs:1727:17:
failed to copy `C:\a\rust\rust\build\x86_64-pc-windows-msvc\stage1-tools\x86_64-pc-windows-msvc\release\miri.exe` to `C:\a\rust\rust\build\x86_64-pc-windows-msvc\stage1\bin\miri.exe`: The process cannot access the file because it is being used by another process. (os error 32)
Build completed unsuccessfully in 0:00:09
  local time: Sat, Jul 27, 2024 11:34:16 PM
  network time: Sat, 27 Jul 2024 23:34:16 GMT
##[error]Process completed with exit code 1.

@bors
Copy link
Contributor

bors commented Jul 27, 2024

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 27, 2024
@jieyouxu
Copy link
Member

@bors retry (failed to copy miri.exe: "The process cannot access the file because it is being used by another process. (os error 32)")

@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 Jul 27, 2024
@bors
Copy link
Contributor

bors commented Jul 28, 2024

⌛ Testing commit 62fb491 with merge 3148b35...

@bors
Copy link
Contributor

bors commented Jul 28, 2024

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 28, 2024
@bors bors merged commit 3148b35 into rust-lang:master Jul 28, 2024
7 checks passed
@rustbot rustbot added this to the 1.82.0 milestone Jul 28, 2024
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (3148b35): 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 -4.0%)

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

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: 770.543s -> 769.808s (-0.10%)
Artifact size: 331.59 MiB -> 331.62 MiB (0.01%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Status: Done
Development

Successfully merging this pull request may close these issues.

6 participants