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

Coalesce dep-info, dep-info-spaces and dep-info-doesnt-run-much run-make tests into dep-info rmake.rs #128787

Merged
merged 1 commit into from
Aug 16, 2024

Conversation

Oneirical
Copy link
Contributor

@Oneirical Oneirical commented Aug 7, 2024

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

This is one of the most ancient tests in the run-make directory and its Makefile does some unexpected things, like creating and deleting a done directory over and over, sleeping at certain times (this is the commit that added the sleep).

I tried to preserve the intent of the test, which is smoke-testing that dep-info works.

try-job: x86_64-msvc
try-job: i686-mingw
try-job: aarch64-gnu
try-job: aarch64-apple
try-job: test-various
try-job: armhf-gnu
try-job: dist-various-1

@rustbot
Copy link
Collaborator

rustbot commented Aug 7, 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 Aug 7, 2024
@rustbot
Copy link
Collaborator

rustbot commented Aug 7, 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

// FIXME try it on windows and freebsd
// on windows `rustc --dep-info` produces Makefile dependency with
// windows native paths (e.g. `c:\path\to\libfoo.a`)
// but msys make seems to fail to recognize such paths, so test fails.
Copy link
Member

Choose a reason for hiding this comment

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

Remark: in msys2, the path might actually be a unix path... so our host (uname -a) is

$ uname -a
MSYS_NT-10.0-22631 Joe 3.5.3.x86_64 2024-06-03 06:22 UTC x86_64 Msys
Screenshot 2024-08-11 111003

@jieyouxu
Copy link
Member

@bors try

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

Coalesce `dep-info`, `dep-info-spaces` and `dep-info-doesnt-run-much` `run-make` tests into `dep-info` rmake.rs

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).

This is one of the most ancient tests in the `run-make` directory and its Makefile does some unexpected things, like creating and deleting a `done` directory over and over, sleeping at certain times (this is the [commit](rust-lang@0d9fd8e) that added the `sleep`).

I tried to preserve the intent of the test, which is smoke-testing that `dep-info` works.

Try:

try-job: x86_64-msvc
try-job: i686-mingw
try-job: dist-x86_64-freebsd
@bors
Copy link
Contributor

bors commented Aug 11, 2024

⌛ Trying commit b54ae7e with merge a0e1ac5...

jieyouxu

This comment was marked as resolved.

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.

Sorry I clicked wrong button

@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 Aug 11, 2024
@bors
Copy link
Contributor

bors commented Aug 11, 2024

☀️ Try build successful - checks-actions
Build commit: a0e1ac5 (a0e1ac5cd8a72b7fd6d958006bca8ebc03f1398f)

@Oneirical
Copy link
Contributor Author

I'm not sure if you want me to change something in particular. I removed the ignore statement, since the try job passed. @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 Aug 12, 2024
@@ -0,0 +1,36 @@
// This is a simple smoke test for rustc's `--emit dep-info` feature. It prints out
// information about dependencies in a Makefile-compatible format, as a `.d` file.
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 make it clear that we don't attempt to check the .d file is in fact Makefile-compatible in this test.

Copy link
Member

Choose a reason for hiding this comment

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

@rustbot author

@jieyouxu
Copy link
Member

@bors try

@jieyouxu
Copy link
Member

Feel free to r=me after clarifying the comment and if try jobs come back green.
@bors delegate+

@bors
Copy link
Contributor

bors commented Aug 15, 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

@jieyouxu
Copy link
Member

@bors rollup=iffy (dep info)

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

Coalesce `dep-info`, `dep-info-spaces` and `dep-info-doesnt-run-much` `run-make` tests into `dep-info` rmake.rs

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).

This is one of the most ancient tests in the `run-make` directory and its Makefile does some unexpected things, like creating and deleting a `done` directory over and over, sleeping at certain times (this is the [commit](rust-lang@0d9fd8e) that added the `sleep`).

I tried to preserve the intent of the test, which is smoke-testing that `dep-info` works.

try-job: x86_64-msvc
try-job: i686-mingw
try-job: aarch64-gnu
try-job: aarch64-apple
try-job: test-various
try-job: armhf-gnu
try-job: dist-various-1
@bors
Copy link
Contributor

bors commented Aug 15, 2024

⌛ Trying commit 7b18186 with merge 5fdefde...

@bors
Copy link
Contributor

bors commented Aug 15, 2024

⌛ Trying commit 7b18186 with merge 8c31459...

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

Coalesce `dep-info`, `dep-info-spaces` and `dep-info-doesnt-run-much` `run-make` tests into `dep-info` rmake.rs

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).

This is one of the most ancient tests in the `run-make` directory and its Makefile does some unexpected things, like creating and deleting a `done` directory over and over, sleeping at certain times (this is the [commit](rust-lang@0d9fd8e) that added the `sleep`).

I tried to preserve the intent of the test, which is smoke-testing that `dep-info` works.

try-job: x86_64-msvc
try-job: i686-mingw
try-job: aarch64-gnu
try-job: aarch64-apple
try-job: test-various
try-job: armhf-gnu
try-job: dist-various-1
@jieyouxu
Copy link
Member

bors go home you're drunk

@bors
Copy link
Contributor

bors commented Aug 15, 2024

☀️ Try build successful - checks-actions
Build commit: 8c31459 (8c31459eb89f44c5e3d903c7703c97475d7c85d6)

@Oneirical
Copy link
Contributor Author

@bors r=@jieyouxu

@bors
Copy link
Contributor

bors commented Aug 15, 2024

📌 Commit 7c4d561 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 Aug 15, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Aug 15, 2024
… r=jieyouxu

Coalesce `dep-info`, `dep-info-spaces` and `dep-info-doesnt-run-much` `run-make` tests into `dep-info` rmake.rs

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).

This is one of the most ancient tests in the `run-make` directory and its Makefile does some unexpected things, like creating and deleting a `done` directory over and over, sleeping at certain times (this is the [commit](rust-lang@0d9fd8e) that added the `sleep`).

I tried to preserve the intent of the test, which is smoke-testing that `dep-info` works.

try-job: x86_64-msvc
try-job: i686-mingw
try-job: aarch64-gnu
try-job: aarch64-apple
try-job: test-various
try-job: armhf-gnu
try-job: dist-various-1
@bors
Copy link
Contributor

bors commented Aug 15, 2024

⌛ Testing commit 7c4d561 with merge 4b7d074...

@bors
Copy link
Contributor

bors commented Aug 16, 2024

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

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

Finished benchmarking commit (4b7d074): 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 2.1%, secondary -1.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)
2.1% [2.1%, 2.1%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-1.1% [-1.1%, -1.1%] 1
All ❌✅ (primary) 2.1% [2.1%, 2.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: 751.842s -> 750.562s (-0.17%)
Artifact size: 339.16 MiB -> 339.13 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.

5 participants