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 extra-filename-with-temp-outputs and issue-85019-moved-src-dir run-make tests to rmake #127338

Merged
merged 2 commits into from
Jul 13, 2024

Conversation

Oneirical
Copy link
Contributor

@Oneirical Oneirical commented Jul 4, 2024

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

Please try:

try-job: armhf-gnu
// try-job: test-various // already tried
try-job: x86_64-msvc
try-job: aarch64-apple

@rustbot
Copy link
Collaborator

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

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

jieyouxu commented Jul 5, 2024

I'll take a look at this PR a bit later today.
@bors delegate+ (for try jobs)

@bors
Copy link
Contributor

bors commented Jul 5, 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 ready-your-arbatests branch from 4d359cc to b0174d3 Compare July 5, 2024 14:05
@Oneirical
Copy link
Contributor Author

@bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 5, 2024
Migrate `extra-filename-with-temp-outputs` and `issue-85019-moved-src-dir` `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: test-various
@bors
Copy link
Contributor

bors commented Jul 5, 2024

⌛ Trying commit b0174d3 with merge 0a4d9df...

@bors
Copy link
Contributor

bors commented Jul 5, 2024

☀️ Try build successful - checks-actions
Build commit: 0a4d9df (0a4d9dfcccd8d805aafc8d3b7ea1ffe0a31840cf)

jieyouxu

This comment was marked as outdated.

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.

Looks good! r=me if try jobs come back green.

// are named as expected.
// See https://github.com/rust-lang/rust/pull/15686

//FIXME(Oneirical): 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.

Suggestion: remove this FIXME if try job comes back green since it seems to work

Copy link
Member

Choose a reason for hiding this comment

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

I think this is not yet addressed.

@jieyouxu
Copy link
Member

jieyouxu commented Jul 6, 2024

@bors try

@jieyouxu
Copy link
Member

jieyouxu commented Jul 6, 2024

@bors try pretty pleasse

@bors
Copy link
Contributor

bors commented Jul 6, 2024

⌛ Trying commit b0174d3 with merge 5f182c8...

bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 6, 2024
Migrate `extra-filename-with-temp-outputs` and `issue-85019-moved-src-dir` `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: armhf-gnu
// try-job: test-various // already tried
try-job: x86_64-msvc
try-job: aarch64-apple
@rust-log-analyzer

This comment has been minimized.

@bors
Copy link
Contributor

bors commented Jul 6, 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 6, 2024
@Oneirical Oneirical force-pushed the ready-your-arbatests branch from b0174d3 to 0df8410 Compare July 8, 2024 15:53
@Oneirical
Copy link
Contributor Author

I have a strong suspicion that target(target()) is breaking things again. @bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 8, 2024
Migrate `extra-filename-with-temp-outputs` and `issue-85019-moved-src-dir` `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: armhf-gnu
// try-job: test-various // already tried
try-job: x86_64-msvc
try-job: aarch64-apple
@bors
Copy link
Contributor

bors commented Jul 8, 2024

⌛ Trying commit 0df8410 with merge dac096a...

@bors
Copy link
Contributor

bors commented Jul 8, 2024

☀️ Try build successful - checks-actions
Build commit: dac096a (dac096affd68ebf0c675ccdaa4fef809e67c6d74)

@Oneirical
Copy link
Contributor Author

There we go. @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 8, 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.

Thank you, just an outdated FIXME, r=me after removing it alongside a rebase.

Comment on lines +306 to +309
/// Returns true if the filename at `path` ends with `suffix`.
pub fn has_suffix<P: AsRef<Path>>(path: P, suffix: &str) -> bool {
path.as_ref().file_name().is_some_and(|name| name.to_str().unwrap().ends_with(suffix))
}
Copy link
Member

Choose a reason for hiding this comment

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

Question: does this addition conflict with any other PR?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No other PR has has_suffix, it's just for this PR.

// are named as expected.
// See https://github.com/rust-lang/rust/pull/15686

//FIXME(Oneirical): 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.

I think this is not yet addressed.

@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 12, 2024
@Oneirical Oneirical force-pushed the ready-your-arbatests branch from 0df8410 to b35e899 Compare July 12, 2024 14:44
@Oneirical Oneirical force-pushed the ready-your-arbatests branch from b35e899 to c6cdbe6 Compare July 12, 2024 14:45
@Oneirical
Copy link
Contributor Author

@bors r=@jieyouxu

@bors
Copy link
Contributor

bors commented Jul 12, 2024

📌 Commit c6cdbe6 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 12, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 12, 2024
…kingjubilee

Rollup of 11 pull requests

Successful merges:

 - rust-lang#126502 (Ignore allocation bytes in some mir-opt tests)
 - rust-lang#126922 (add lint for inline asm labels that look like binary)
 - rust-lang#127209 (Added the `xop` target-feature and the `xop_target_feature` feature gate)
 - rust-lang#127310 (Fix import suggestion ice)
 - rust-lang#127338 (Migrate `extra-filename-with-temp-outputs` and `issue-85019-moved-src-dir` `run-make` tests to rmake)
 - rust-lang#127381 (Migrate `issue-83045`, `rustc-macro-dep-files` and `env-dep-info` `run-make` tests to rmake)
 - rust-lang#127535 (Fire unsafe_code lint on unsafe extern blocks)
 - rust-lang#127619 (Suggest using precise capturing for hidden type that captures region)
 - rust-lang#127631 (Remove `fully_normalize`)
 - rust-lang#127632 (Implement `precise_capturing` support for rustdoc)
 - rust-lang#127660 (Rename the internal `const_strlen` to just `strlen`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 6cdef05 into rust-lang:master Jul 13, 2024
6 checks passed
@rustbot rustbot added this to the 1.81.0 milestone Jul 13, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jul 13, 2024
Rollup merge of rust-lang#127338 - Oneirical:ready-your-arbatests, r=jieyouxu

Migrate `extra-filename-with-temp-outputs` and `issue-85019-moved-src-dir` `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: armhf-gnu
// try-job: test-various // already tried
try-job: x86_64-msvc
try-job: aarch64-apple
@Oneirical Oneirical deleted the ready-your-arbatests branch July 14, 2024 12:23
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 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